From b882d564596e8b53e6adaa80a17b3aef8395f3e0 Mon Sep 17 00:00:00 2001 From: "Nabiullin, Oleg" Date: Mon, 22 Mar 2021 20:41:39 +0300 Subject: [PATCH] API 1.35 - remove VERSION_NEXT --- _studio/mfx_lib/encode_hw/CMakeLists.txt | 1 - .../agnostic/base/hevcehw_base_dpb_report.cpp | 74 ----- .../agnostic/base/hevcehw_base_dpb_report.h | 54 ---- .../agnostic/base/hevcehw_base_legacy.cpp | 22 -- .../base/hevcehw_base_legacy_defaults.cpp | 4 - .../hevc/linux/base/hevcehw_base_fei_lin.cpp | 6 - .../hevc/linux/base/hevcehw_base_lin.cpp | 16 +- _studio/mfx_lib/shared/src/mfx_common_int.cpp | 9 - _studio/shared/include/mfx_config.h | 7 - .../shared/src/mfx_static_assert_structs.cpp | 270 ------------------ .../h265_dec/src/umc_h265_va_packer_cenc.cpp | 4 - api/include/mfxcommon.h | 6 - api/include/mfxfeihevc.h | 137 --------- api/include/mfxstructures.h | 189 ------------ api/include/mfxvp9.h | 19 -- api/mediasdk_structures/ts_ext_buffers_decl.h | 10 - api/mediasdk_structures/ts_struct_decl.h | 107 +------ api/mfx_dispatch/windows/src/main.cpp | 48 ---- .../windows/src/mfx_dispatcher.cpp | 3 - .../windows/src/mfx_library_iterator.cpp | 4 - samples/sample_common/include/sample_defs.h | 10 - .../sample_common/src/parameters_dumper.cpp | 5 - .../sample_encode/include/pipeline_encode.h | 5 - samples/sample_encode/src/pipeline_encode.cpp | 18 -- samples/sample_encode/src/sample_encode.cpp | 24 -- tools/CMakeLists.txt | 10 +- tools/tracer/dumps/dump.cpp | 13 - tools/tracer/dumps/dump.h | 9 - tools/tracer/dumps/dump_mfxstructures.cpp | 84 +----- 29 files changed, 15 insertions(+), 1153 deletions(-) delete mode 100644 _studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.cpp delete mode 100644 _studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.h diff --git a/_studio/mfx_lib/encode_hw/CMakeLists.txt b/_studio/mfx_lib/encode_hw/CMakeLists.txt index 93f4b746a8..c851158b46 100644 --- a/_studio/mfx_lib/encode_hw/CMakeLists.txt +++ b/_studio/mfx_lib/encode_hw/CMakeLists.txt @@ -80,7 +80,6 @@ list( APPEND sources hevc/agnostic/base/hevcehw_base_alloc.cpp hevc/agnostic/base/hevcehw_base_constraints.cpp hevc/agnostic/base/hevcehw_base_dirty_rect.cpp - hevc/agnostic/base/hevcehw_base_dpb_report.cpp hevc/agnostic/base/hevcehw_base_encoded_frame_info.cpp hevc/agnostic/base/hevcehw_base_ext_brc.cpp hevc/agnostic/base/hevcehw_base_la_ext_brc.cpp diff --git a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.cpp b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.cpp deleted file mode 100644 index 66491bf6fd..0000000000 --- a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) 2019-2020 Intel Corporation -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#include "mfx_common.h" -#if defined(MFX_ENABLE_H265_VIDEO_ENCODE) && (MFX_VERSION >= MFX_VERSION_NEXT) - -#include "hevcehw_base_dpb_report.h" - -using namespace HEVCEHW; -using namespace HEVCEHW::Base; - -void DPBReport::SetSupported(ParamSupport& blocks) -{ - blocks.m_ebCopySupported[MFX_EXTBUFF_DPB].emplace_back( - [](const mfxExtBuffer* pSrc, mfxExtBuffer* pDst) -> void - { - auto& src = *(const mfxExtDPB*)pSrc; - auto& dst = *(mfxExtDPB*)pDst; - - dst.DPBSize = src.DPBSize; - - for (mfxU32 i = 0; i < Size(src.DPB); ++i) - { - dst.DPB[i].FrameOrder = src.DPB[i].FrameOrder; - dst.DPB[i].LongTermIdx = src.DPB[i].LongTermIdx; - dst.DPB[i].PicType = src.DPB[i].PicType; - } - }); -} - -void DPBReport::QueryTask(const FeatureBlocks& /*blocks*/, TPushQT Push) -{ - Push(BLK_Report - , [](StorageW& /*global*/, StorageW& s_task) -> mfxStatus - { - auto& task = Task::Common::Get(s_task); - MFX_CHECK(task.pBsOut, MFX_ERR_NONE); - - mfxExtDPB* pDPBReport = ExtBuffer::Get(*task.pBsOut); - MFX_CHECK(pDPBReport, MFX_ERR_NONE); - - auto& report = *pDPBReport; - const auto& DPB = task.DPB.After; - auto& i = report.DPBSize; - - for (i = 0; !isDpbEnd(DPB, i); ++i) - { - report.DPB[i].FrameOrder = DPB[i].DisplayOrder; - report.DPB[i].LongTermIdx = DPB[i].isLTR ? 0 : MFX_LONGTERM_IDX_NO_IDX; - report.DPB[i].PicType = MFX_PICTYPE_FRAME; - } - - return MFX_ERR_NONE; - }); -} - -#endif //defined(MFX_ENABLE_H265_VIDEO_ENCODE) diff --git a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.h b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.h deleted file mode 100644 index 7354023a96..0000000000 --- a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) 2019-2020 Intel Corporation -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#pragma once - -#include "mfx_common.h" -#if defined(MFX_ENABLE_H265_VIDEO_ENCODE) && (MFX_VERSION >= MFX_VERSION_NEXT) - -#include "hevcehw_base.h" -#include "hevcehw_base_data.h" - -namespace HEVCEHW -{ - namespace Base - { - class DPBReport - : public FeatureBase - { - public: -#define DECL_BLOCK_LIST\ - DECL_BLOCK(Report) -#define DECL_FEATURE_NAME "Base_DPBReport" -#include "hevcehw_decl_blocks.h" - - DPBReport(mfxU32 FeatureId) - : FeatureBase(FeatureId) - {} - - protected: - virtual void SetSupported(ParamSupport& par) override; - virtual void QueryTask(const FeatureBlocks& blocks, TPushQT Push) override; - }; - - } //Base -} //namespace HEVCEHW - -#endif //defined(MFX_ENABLE_H265_VIDEO_ENCODE) \ No newline at end of file diff --git a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy.cpp b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy.cpp index 6f1274130b..84f6facf5c 100644 --- a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy.cpp +++ b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy.cpp @@ -193,10 +193,6 @@ void Legacy::SetSupported(ParamSupport& blocks) MFX_COPY_FIELD(WinBRCSize); MFX_COPY_FIELD(EnableNalUnitType); MFX_COPY_FIELD(LowDelayBRC); -#if MFX_VERSION >= MFX_VERSION_NEXT - MFX_COPY_FIELD(DeblockingAlphaTcOffset); - MFX_COPY_FIELD(DeblockingBetaOffset); -#endif MFX_COPY_FIELD(BRCPanicMode); MFX_COPY_FIELD(ScenarioInfo); }); @@ -3655,10 +3651,6 @@ mfxStatus Legacy::CheckESPackParam(mfxVideoParam & par, eMFXHWType hw) , mfxU16(MFX_CODINGOPTION_OFF) , mfxU16(MFX_CODINGOPTION_ON * !!par.mfx.EncodedOrder)); -#if MFX_VERSION >= MFX_VERSION_NEXT - changed += CheckRangeOrSetDefault(pCO3->DeblockingAlphaTcOffset, -12, 12, 0); - changed += CheckRangeOrSetDefault(pCO3->DeblockingBetaOffset, -12, 12, 0); -#endif } MFX_CHECK(!changed, MFX_WRN_INCOMPATIBLE_VIDEO_PARAM); @@ -4762,20 +4754,6 @@ mfxStatus Legacy::GetSliceHeader( s.deblocking_filter_override_flag = (s.deblocking_filter_disabled_flag != pps.deblocking_filter_disabled_flag); s.beta_offset_div2 = pps.beta_offset_div2; s.tc_offset_div2 = pps.tc_offset_div2; -#if MFX_VERSION >= MFX_VERSION_NEXT - const mfxExtCodingOption3& CO3 = ExtBuffer::Get(par); - const mfxExtCodingOption3 *pCO3 = ExtBuffer::Get(task.ctrl); - - SetDefault(pCO3, &CO3); - - s.beta_offset_div2 = mfxI8(mfx::clamp(mfxI32(pCO3->DeblockingBetaOffset), -12, 12) * 0.5 * !s.deblocking_filter_disabled_flag); - s.tc_offset_div2 = mfxI8(mfx::clamp(mfxI32(pCO3->DeblockingAlphaTcOffset), -12, 12) * 0.5 * !s.deblocking_filter_disabled_flag); - - s.deblocking_filter_override_flag |= - !s.deblocking_filter_disabled_flag - && (s.beta_offset_div2 != pps.beta_offset_div2 - || s.tc_offset_div2 != pps.tc_offset_div2); -#endif s.loop_filter_across_slices_enabled_flag = pps.loop_filter_across_slices_enabled_flag; s.num_entry_point_offsets *= !(pps.tiles_enabled_flag || pps.entropy_coding_sync_enabled_flag); diff --git a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy_defaults.cpp b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy_defaults.cpp index 254e5dde65..776b03c318 100644 --- a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy_defaults.cpp +++ b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy_defaults.cpp @@ -2086,10 +2086,6 @@ class GetDefault pps.deblocking_filter_control_present_flag = 1; pps.deblocking_filter_disabled_flag = !!CO2.DisableDeblockingIdc; pps.deblocking_filter_override_enabled_flag = 1; // to disable deblocking per frame -#if MFX_VERSION >= MFX_VERSION_NEXT - pps.beta_offset_div2 = mfxI8(CO3.DeblockingBetaOffset * 0.5 * !pps.deblocking_filter_disabled_flag); - pps.tc_offset_div2 = mfxI8(CO3.DeblockingAlphaTcOffset * 0.5 * !pps.deblocking_filter_disabled_flag); -#endif pps.scaling_list_data_present_flag = 0; pps.lists_modification_present_flag = 1; diff --git a/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_fei_lin.cpp b/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_fei_lin.cpp index 908f50c2cc..57235f4caf 100644 --- a/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_fei_lin.cpp +++ b/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_fei_lin.cpp @@ -342,15 +342,9 @@ void FEI::InitAlloc(const FeatureBlocks& /*blocks*/, TPushIA Push) } // Output buffers -#if MFX_VERSION >= MFX_VERSION_NEXT - vaFrameCtrl.ctb_cmd = GetVaBufferID(task.pBsOut, MFX_EXTBUFF_HEVCFEI_PAK_CTU_REC); - vaFrameCtrl.cu_record = GetVaBufferID(task.pBsOut, MFX_EXTBUFF_HEVCFEI_PAK_CU_REC); - vaFrameCtrl.distortion = GetVaBufferID(task.pBsOut, MFX_EXTBUFF_HEVCFEI_ENC_DIST); -#else vaFrameCtrl.ctb_cmd = VA_INVALID_ID; vaFrameCtrl.cu_record = VA_INVALID_ID; vaFrameCtrl.distortion = VA_INVALID_ID; -#endif return true; }); diff --git a/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_lin.cpp b/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_lin.cpp index 8e741d2e37..b0af1a09db 100644 --- a/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_lin.cpp +++ b/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_lin.cpp @@ -32,9 +32,6 @@ #include "hevcehw_base_task.h" #include "hevcehw_base_ext_brc.h" #include "hevcehw_base_dirty_rect_lin.h" -#if !defined(MFX_EXT_DPB_HEVC_DISABLE) && (MFX_VERSION >= MFX_VERSION_NEXT) -#include "hevcehw_base_dpb_report.h" -#endif #include "hevcehw_base_hdr_sei.h" #include "hevcehw_base_va_lin.h" #include "hevcehw_base_va_packer_lin.h" @@ -83,9 +80,6 @@ Linux::Base::MFXVideoENCODEH265_HW::MFXVideoENCODEH265_HW( m_features.emplace_back(new Packer(FEATURE_PACKER)); m_features.emplace_back(new ExtBRC(FEATURE_EXT_BRC)); m_features.emplace_back(new DirtyRect(FEATURE_DIRTY_RECT)); -#if !defined(MFX_EXT_DPB_HEVC_DISABLE) && (MFX_VERSION >= MFX_VERSION_NEXT) - m_features.emplace_back(new DPBReport(FEATURE_DPB_REPORT)); -#endif m_features.emplace_back(new HdrSei(FEATURE_HDR_SEI)); m_features.emplace_back(new Interlace(FEATURE_INTERLACE)); m_features.emplace_back(new EncodedFrameInfo(FEATURE_ENCODED_FRAME_INFO)); @@ -123,11 +117,11 @@ ImplBase* Linux::Base::MFXVideoENCODEH265_HW::ApplyMode(mfxU32 mode) if (bInitFEI) { - mfxU32 featureMode = - (QUERY0 * !BQ::Get(*this).empty()) - + (QUERY1 * !BQ::Get(*this).empty()) - + (QUERY_IO_SURF * !BQ::Get(*this).empty()) - + (INIT * !BQ::Get(*this).empty()) + mfxU32 featureMode = + (QUERY0 * !BQ::Get(*this).empty()) + + (QUERY1 * !BQ::Get(*this).empty()) + + (QUERY_IO_SURF * !BQ::Get(*this).empty()) + + (INIT * !BQ::Get(*this).empty()) + (RUNTIME * !BQ::Get(*this).empty()); m_features.emplace_back(new FEI(FEATURE_FEI)); diff --git a/_studio/mfx_lib/shared/src/mfx_common_int.cpp b/_studio/mfx_lib/shared/src/mfx_common_int.cpp index d3b3350c41..86a66e210f 100644 --- a/_studio/mfx_lib/shared/src/mfx_common_int.cpp +++ b/_studio/mfx_lib/shared/src/mfx_common_int.cpp @@ -325,15 +325,6 @@ mfxStatus UpdateCscOutputFormat(mfxVideoParam *par, mfxFrameAllocRequest *reques request->Info.BitDepthLuma = 10; request->Info.Shift = 0; break; -#endif - // 12 bit -#if (MFX_VERSION >= MFX_VERSION_NEXT) - case MFX_FOURCC_P016: - case MFX_FOURCC_Y416: - case MFX_FOURCC_Y216: - request->Info.BitDepthLuma = 12; - request->Info.Shift = 1; - break; #endif case MFX_FOURCC_RGB4: request->Info.BitDepthLuma = 0; diff --git a/_studio/shared/include/mfx_config.h b/_studio/shared/include/mfx_config.h index e682d8ff8b..1cabe60a80 100644 --- a/_studio/shared/include/mfx_config.h +++ b/_studio/shared/include/mfx_config.h @@ -101,9 +101,6 @@ #define MFX_ENABLE_VPP_COMPOSITION #define MFX_ENABLE_VPP_ROTATION #define MFX_ENABLE_VPP_VIDEO_SIGNAL - #if MFX_VERSION >= MFX_VERSION_NEXT - #define MFX_ENABLE_VPP_RUNTIME_HSBC - #endif //#define MFX_ENABLE_VPP_FRC #endif @@ -111,10 +108,6 @@ #define MFX_ENABLE_SCENE_CHANGE_DETECTION_VPP #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) && defined(MFX_ENABLE_MCTF) - #define MFX_ENABLE_MCTF_EXT // extended MCTF interface -#endif - #if MFX_VERSION >= 1028 #define MFX_ENABLE_RGBP #define MFX_ENABLE_FOURCC_RGB565 diff --git a/_studio/shared/src/mfx_static_assert_structs.cpp b/_studio/shared/src/mfx_static_assert_structs.cpp index 43fd50e909..d649568492 100644 --- a/_studio/shared/src/mfx_static_assert_structs.cpp +++ b/_studio/shared/src/mfx_static_assert_structs.cpp @@ -174,14 +174,6 @@ MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcEncCtuCtrl ,136) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcRepackCtrl ,40 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcRepackStat ,128) -#if MFX_VERSION >= MFX_VERSION_NEXT - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxFeiHevcPakCtuRecordV0 ,16 ) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcPakCtuRecordV0 ,136) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxFeiHevcPakCuRecordV0 ,56 ) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcPakCuRecordV0 ,136) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxFeiHevcDistortionCtu ,8 ) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcDistortion ,40 ) -#endif #endif #elif defined(LINUX32) #if (MFX_VERSION >= 1027) @@ -193,14 +185,6 @@ MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcEncCtuCtrl ,132) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcRepackCtrl ,40 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcRepackStat ,128) -#if MFX_VERSION >= MFX_VERSION_NEXT - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxFeiHevcPakCtuRecordV0 ,16 ) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcPakCtuRecordV0 ,132) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxFeiHevcPakCuRecordV0 ,56 ) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcPakCuRecordV0 ,132) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxFeiHevcDistortionCtu ,8 ) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtFeiHevcDistortion ,36 ) -#endif #endif #endif #endif //defined (__MFXFEIHEVC_H__) @@ -357,9 +341,6 @@ MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMBForceIntra ,64 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtHEVCTiles ,160 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMBDisableSkipMap ,64 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtDPB ,544 ) -#endif MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtHEVCParam ,256 ) #if (MFX_VERSION >= 1025) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtDecodeErrorReport ,32 ) @@ -370,22 +351,12 @@ MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtPredWeightTable ,1152 ) #if (MFX_VERSION >= 1027) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtAVCRoundingOffset ,64 ) -#endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtTemporalLayers ,544 ) #endif MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtDirtyRect ,8224 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMoveRect ,8224 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtAVCScalingMatrix ,512 ) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMPEG2QuantMatrix ,324 ) -#endif MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVPPRotation ,32 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtEncodedSlicesInfo ,64 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVPPScaling ,32 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtSceneChange ,32 ) -#endif MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVPPMirroring ,32 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMVOverPicBoundaries ,32 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVPPColorFill ,32 ) @@ -479,9 +450,6 @@ MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMBForceIntra ,64 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtHEVCTiles ,160 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMBDisableSkipMap ,64 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtDPB ,544 ) -#endif MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtHEVCParam ,256 ) #if (MFX_VERSION >= 1025) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtDecodeErrorReport ,32 ) @@ -492,22 +460,12 @@ MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtPredWeightTable ,1152 ) #if (MFX_VERSION >= 1027) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtAVCRoundingOffset ,64 ) -#endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtTemporalLayers ,544 ) #endif MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtDirtyRect ,8224 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMoveRect ,8224 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtAVCScalingMatrix ,512 ) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMPEG2QuantMatrix ,324 ) -#endif MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVPPRotation ,32 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtEncodedSlicesInfo ,64 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVPPScaling ,32 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtSceneChange ,32 ) -#endif MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVPPMirroring ,32 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtMVOverPicBoundaries ,32 ) MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVPPColorFill ,32 ) @@ -566,19 +524,6 @@ #endif #endif //defined (__MFXVP8_H__) -//mfxvp9.h -#if defined (__MFXVP9_H__) - #if defined(LINUX64) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVP9DecodedFrameInfo ,128 ) -#endif - #elif defined(LINUX32) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_SIZE(mfxExtVP9DecodedFrameInfo ,128 ) -#endif - #endif -#endif //defined (__MFXVP9_H__) - //mfxbrc.h #if defined (__MFXBRC_H__) #if defined(LINUX64) @@ -1050,18 +995,10 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,BitstreamRestriction ,44 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,LowDelayHrd ,46 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,MotionVectorsOverPicBoundaries,48 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,Log2MaxMvLengthHorizontal ,50 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,Log2MaxMvLengthVertical ,52 ) -#endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,ScenarioInfo ,54 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,ContentInfo ,56 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,PRefType ,58 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,FadeDetection ,60 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,DeblockingAlphaTcOffset ,62 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,DeblockingBetaOffset ,64 ) -#endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,GPB ,66 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,MaxFrameSizeI ,68 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,MaxFrameSizeP ,72 ) @@ -1070,27 +1007,14 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,NumRefActiveP ,106 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,NumRefActiveBL0 ,122 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,NumRefActiveBL1 ,138 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,ConstrainedIntraPredFlag ,154 ) -#endif #if (MFX_VERSION >= 1026) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,TransformSkip ,156 ) -#endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,TargetChromaFormatPlus1 ,158 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,TargetBitDepthLuma ,160 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,TargetBitDepthChroma ,162 ) #endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,BRCPanicMode ,164 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,LowDelayBRC ,166 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,EnableMBForceIntra ,168 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,AdaptiveMaxFrameSize ,170 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,RepartitionCheckEnable ,172 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,QuantScaleType ,174 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,IntraVLCFormat ,176 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,ScanType ,178 ) -#endif #if (MFX_VERSION >= 1025) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,EncodedUnitsInfo ,180 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,EnableNalUnitType ,182 ) @@ -1161,9 +1085,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFrameAllocResponse ,AllocId ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFrameAllocResponse ,mids ,16 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFrameAllocResponse ,NumFrameActual ,24 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFrameAllocResponse ,MemType ,26 ) -#endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOptionSPSPPS ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOptionSPSPPS ,SPSBuffer ,8 ) @@ -1409,15 +1330,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMBDisableSkipMap ,MapSize ,52 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMBDisableSkipMap ,Map ,56 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPBSize ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPB ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPB[0].FrameOrder ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPB[0].PicType ,36 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPB[0].LongTermIdx ,38 ) -#endif - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtHEVCParam ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtHEVCParam ,PicWidthInLumaSamples ,8 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtHEVCParam ,PicHeightInLumaSamples ,10 ) @@ -1462,19 +1374,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCRoundingOffset ,RoundingOffsetInter ,14 ) #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].Scale ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].QPI ,34 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].QPP ,36 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].QPB ,38 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].TargetKbps ,40 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].MaxKbps ,44 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].BufferSizeInKB ,48 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].InitialDelayInKB ,52 ) -#endif - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDirtyRect ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDirtyRect ,NumRect ,8 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDirtyRect ,Rect ,32 ) @@ -1493,18 +1392,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMoveRect ,Rect[0].SourceLeft ,48 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMoveRect ,Rect[0].SourceTop ,52 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,Type ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,ScalingListPresent ,20 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,ScalingList4x4 ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,ScalingList8x8 ,128 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMPEG2QuantMatrix ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMPEG2QuantMatrix ,LoadMatrix ,64 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMPEG2QuantMatrix ,Matrix ,68 ) -#endif - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPRotation ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPRotation ,Angle ,8 ) @@ -1518,11 +1405,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPScaling ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPScaling ,ScalingMode ,8 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtSceneChange ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtSceneChange ,Type ,8 ) -#endif - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPMirroring ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPMirroring ,Type ,8 ) @@ -1561,10 +1443,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,FrameWidth ,8 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,FrameHeight ,10 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,WriteIVFHeaders ,12 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,LoopFilterRefDelta ,14 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,LoopFilterModeDelta ,22 ) -#endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,QIndexDeltaLumaDC ,26 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,QIndexDeltaChromaAC ,28 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,QIndexDeltaChromaDC ,30 ) @@ -1594,13 +1472,6 @@ #if (MFX_VERSION >= 1026) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,FilterStrength ,8 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,Overlap ,10 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,BitsPerPixelx100k ,12 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,Deblocking ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,TemporalMode ,18 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,MVPrecision ,20 ) -#endif #endif #if (MFX_VERSION >= 1034) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxAV1FilmGrainPoint ,Value ,0 ) @@ -1843,18 +1714,10 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,BitstreamRestriction ,44 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,LowDelayHrd ,46 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,MotionVectorsOverPicBoundaries,48 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,Log2MaxMvLengthHorizontal ,50 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,Log2MaxMvLengthVertical ,52 ) -#endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,ScenarioInfo ,54 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,ContentInfo ,56 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,PRefType ,58 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,FadeDetection ,60 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,DeblockingAlphaTcOffset ,62 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,DeblockingBetaOffset ,64 ) -#endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,GPB ,66 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,MaxFrameSizeI ,68 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,MaxFrameSizeP ,72 ) @@ -1863,9 +1726,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,NumRefActiveP ,106 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,NumRefActiveBL0 ,122 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,NumRefActiveBL1 ,138 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,ConstrainedIntraPredFlag ,154 ) -#endif #if (MFX_VERSION >= 1026) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,TransformSkip ,156 ) #endif @@ -1879,11 +1739,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,EnableMBForceIntra ,168 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,AdaptiveMaxFrameSize ,170 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,RepartitionCheckEnable ,172 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,QuantScaleType ,174 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,IntraVLCFormat ,176 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,ScanType ,178 ) -#endif #if (MFX_VERSION >= 1025) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,EncodedUnitsInfo ,180 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOption3 ,EnableNalUnitType ,182 ) @@ -1954,9 +1809,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFrameAllocResponse ,AllocId ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFrameAllocResponse ,mids ,16 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFrameAllocResponse ,NumFrameActual ,20 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFrameAllocResponse ,MemType ,22 ) -#endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOptionSPSPPS ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtCodingOptionSPSPPS ,SPSBuffer ,8 ) @@ -2201,15 +2053,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMBDisableSkipMap ,MapSize ,52 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMBDisableSkipMap ,Map ,56 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPBSize ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPB ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPB[0].FrameOrder ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPB[0].PicType ,36 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDPB ,DPB[0].LongTermIdx ,38 ) -#endif - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtHEVCParam ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtHEVCParam ,PicWidthInLumaSamples ,8 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtHEVCParam ,PicHeightInLumaSamples ,10 ) @@ -2254,19 +2097,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCRoundingOffset ,RoundingOffsetInter ,14 ) #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].Scale ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].QPI ,34 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].QPP ,36 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].QPB ,38 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].TargetKbps ,40 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].MaxKbps ,44 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].BufferSizeInKB ,48 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtTemporalLayers ,Layer[0].InitialDelayInKB ,52 ) -#endif - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDirtyRect ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDirtyRect ,NumRect ,8 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtDirtyRect ,Rect ,32 ) @@ -2285,18 +2115,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMoveRect ,Rect[0].SourceLeft ,48 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMoveRect ,Rect[0].SourceTop ,52 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,Type ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,ScalingListPresent ,20 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,ScalingList4x4 ,32 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtAVCScalingMatrix ,ScalingList8x8 ,128 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMPEG2QuantMatrix ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMPEG2QuantMatrix ,LoadMatrix ,64 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtMPEG2QuantMatrix ,Matrix ,68 ) -#endif - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPRotation ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPRotation ,Angle ,8 ) @@ -2310,11 +2128,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPScaling ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPScaling ,ScalingMode ,8 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtSceneChange ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtSceneChange ,Type ,8 ) -#endif - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPMirroring ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVPPMirroring ,Type ,8 ) @@ -2353,10 +2166,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,FrameWidth ,8 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,FrameHeight ,10 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,WriteIVFHeaders ,12 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,LoopFilterRefDelta ,14 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,LoopFilterModeDelta ,22 ) -#endif MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,QIndexDeltaLumaDC ,26 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,QIndexDeltaChromaAC ,28 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9Param ,QIndexDeltaChromaDC ,30 ) @@ -2386,13 +2195,6 @@ #if (MFX_VERSION >= 1026) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,FilterStrength ,8 ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,Overlap ,10 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,BitsPerPixelx100k ,12 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,Deblocking ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,TemporalMode ,18 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVppMctf ,MVPrecision ,20 ) -#endif #endif #if (MFX_VERSION >= 1034) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxAV1FilmGrainPoint ,Value ,0 ) @@ -3082,34 +2884,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcRepackStat ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcRepackStat ,NumPasses ,8 ) -#if MFX_VERSION >= MFX_VERSION_NEXT - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,VaBufferID ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,Pitch ,12 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,Height ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,Data ,128 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,MVs ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,MVs[0].x ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,MVs[0].y ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,RefIdx ,40 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,TuSize ,44 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,VaBufferID ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,Pitch ,12 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,Height ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,Data ,128 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcDistortionCtu ,BestDistortion ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcDistortionCtu ,ColocatedCtuDistortion ,4 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,VaBufferID ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,Pitch ,12 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,Height ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,Data ,32 ) -#endif #endif #elif defined(LINUX32) #if (MFX_VERSION >= 1027) @@ -3158,34 +2932,6 @@ MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcRepackStat ,Header ,0 ) MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcRepackStat ,NumPasses ,8 ) -#if MFX_VERSION >= MFX_VERSION_NEXT - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,VaBufferID ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,Pitch ,12 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,Height ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCtuRecordV0 ,Data ,128 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,MVs ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,MVs[0].x ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,MVs[0].y ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,RefIdx ,40 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcPakCuRecordV0 ,TuSize ,44 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,VaBufferID ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,Pitch ,12 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,Height ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcPakCuRecordV0 ,Data ,128 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcDistortionCtu ,BestDistortion ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxFeiHevcDistortionCtu ,ColocatedCtuDistortion ,4 ) - - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,VaBufferID ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,Pitch ,12 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,Height ,16 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtFeiHevcDistortion ,Data ,32 ) -#endif #endif #endif #endif //defined (__MFXFEIHEVC_H__) @@ -3420,22 +3166,6 @@ #endif #endif //defined (__MFXVP8_H__) -//mfxvp9.h -#if defined (__MFXVP9_H__) - #if defined(LINUX64) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9DecodedFrameInfo ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9DecodedFrameInfo ,DisplayWidth ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9DecodedFrameInfo ,DisplayHeight ,10 ) -#endif - #elif defined(LINUX32) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9DecodedFrameInfo ,Header ,0 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9DecodedFrameInfo ,DisplayWidth ,8 ) - MSDK_STATIC_ASSERT_STRUCT_OFFSET(mfxExtVP9DecodedFrameInfo ,DisplayHeight ,10 ) -#endif - #endif -#endif //defined (__MFXVP9_H__) //mfxbrc.h #if defined (__MFXBRC_H__) diff --git a/_studio/shared/umc/codec/h265_dec/src/umc_h265_va_packer_cenc.cpp b/_studio/shared/umc/codec/h265_dec/src/umc_h265_va_packer_cenc.cpp index 3c72e49db9..ac60c5ba55 100644 --- a/_studio/shared/umc/codec/h265_dec/src/umc_h265_va_packer_cenc.cpp +++ b/_studio/shared/umc/codec/h265_dec/src/umc_h265_va_packer_cenc.cpp @@ -34,11 +34,7 @@ using namespace UMC; -#if (MFX_VERSION >= MFX_VERSION_NEXT) -#define PACKER_VAAPI G12::PackerVAAPI -#else #define PACKER_VAAPI G11::PackerVAAPI -#endif namespace UMC_HEVC_DECODER { diff --git a/api/include/mfxcommon.h b/api/include/mfxcommon.h index 0171d6d522..75d70f8008 100755 --- a/api/include/mfxcommon.h +++ b/api/include/mfxcommon.h @@ -54,18 +54,12 @@ enum { MFX_IMPL_HARDWARE3 = 0x0006, /* Hardware accelerated implementation (3rd device) */ MFX_IMPL_HARDWARE4 = 0x0007, /* Hardware accelerated implementation (4th device) */ MFX_IMPL_RUNTIME = 0x0008, -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MFX_IMPL_SINGLE_THREAD= 0x0009, -#endif MFX_IMPL_VIA_ANY = 0x0100, MFX_IMPL_VIA_D3D9 = 0x0200, MFX_IMPL_VIA_D3D11 = 0x0300, MFX_IMPL_VIA_VAAPI = 0x0400, MFX_IMPL_AUDIO = 0x8000, -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MFX_IMPL_EXTERNAL_THREADING = 0x10000, -#endif MFX_IMPL_UNSUPPORTED = 0x0000 /* One of the MFXQueryIMPL returns */ }; diff --git a/api/include/mfxfeihevc.h b/api/include/mfxfeihevc.h index 4d976fe128..97dafb083a 100644 --- a/api/include/mfxfeihevc.h +++ b/api/include/mfxfeihevc.h @@ -133,137 +133,6 @@ MFX_DEPRECATED typedef struct { } mfxExtFeiHevcRepackStat; MFX_PACK_END() -#if MFX_VERSION >= MFX_VERSION_NEXT -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - /* DWORD 0 */ - mfxU32 reserved0; - - /* DWORD 1 */ - mfxU32 SplitLevel2Part0 : 4; - mfxU32 SplitLevel2Part1 : 4; - mfxU32 SplitLevel2Part2 : 4; - mfxU32 SplitLevel2Part3 : 4; - mfxU32 SplitLevel1 : 4; - mfxU32 SplitLevel0 : 1; - mfxU32 reserved10 : 3; - mfxU32 CuCountMinus1 : 6; - mfxU32 LastCtuOfTileFlag : 1; - mfxU32 LastCtuOfSliceFlag : 1; - - - /* DWORD 2 */ - mfxU32 CtuAddrX : 16; - mfxU32 CtuAddrY : 16; - - /* DWORD 3 */ - mfxU32 reserved3; -} mfxFeiHevcPakCtuRecordV0; -MFX_PACK_END() - -MFX_PACK_BEGIN_STRUCT_W_PTR() -MFX_DEPRECATED typedef struct { - mfxExtBuffer Header; - mfxU32 VaBufferID; - mfxU32 Pitch; - mfxU32 Height; - mfxU16 reserved0[54]; - - mfxFeiHevcPakCtuRecordV0 *Data; -} mfxExtFeiHevcPakCtuRecordV0; -MFX_PACK_END() - -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - /* DWORD 0 */ - mfxU32 CuSize : 2; - mfxU32 PredMode : 1; - mfxU32 TransquantBypass : 1; - mfxU32 PartMode : 3; - mfxU32 IpcmEnable : 1; - mfxU32 IntraChromaMode : 3; - mfxU32 ZeroOutCoeffs : 1; - mfxU32 reserved00 : 4; - mfxU32 Qp : 7; - mfxU32 QpSign : 1; - mfxU32 InterpredIdc : 8; - - - /* DWORD 1 */ - mfxU32 IntraMode0 : 6; - mfxU32 reserved10 : 2; - mfxU32 IntraMode1 : 6; - mfxU32 reserved11 : 2; - mfxU32 IntraMode2 : 6; - mfxU32 reserved12 : 2; - mfxU32 IntraMode3 : 6; - mfxU32 reserved13 : 2; - - - /* DWORD 2-9 */ - struct { - mfxI16 x[4]; - mfxI16 y[4]; - } MVs[2]; /* 0-L0, 1-L1 */ - - - /* DWORD 10 */ - struct{ - mfxU16 Ref0 : 4; - mfxU16 Ref1 : 4; - mfxU16 Ref2 : 4; - mfxU16 Ref3 : 4; - } RefIdx[2]; /* 0-L0, 1-L1 */ - - - /* DWORD 11 */ - mfxU32 TuSize; - - - /* DWORD 12 */ - mfxU32 TransformSkipY : 16; - mfxU32 reserved120 : 12; - mfxU32 TuCountM1 : 4; - - - /* DWORD 13 */ - mfxU32 TransformSkipU : 16; - mfxU32 TransformSkipV : 16; -} mfxFeiHevcPakCuRecordV0; -MFX_PACK_END() - -MFX_PACK_BEGIN_STRUCT_W_PTR() -MFX_DEPRECATED typedef struct { - mfxExtBuffer Header; - mfxU32 VaBufferID; - mfxU32 Pitch; - mfxU32 Height; - mfxU16 reserved0[54]; - - mfxFeiHevcPakCuRecordV0 *Data; -} mfxExtFeiHevcPakCuRecordV0; -MFX_PACK_END() - -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - mfxU32 BestDistortion; - mfxU32 ColocatedCtuDistortion; -} mfxFeiHevcDistortionCtu; -MFX_PACK_END() - -MFX_PACK_BEGIN_STRUCT_W_PTR() -MFX_DEPRECATED typedef struct { - mfxExtBuffer Header; - mfxU32 VaBufferID; - mfxU32 Pitch; - mfxU32 Height; - mfxU16 reserved[6]; - - mfxFeiHevcDistortionCtu *Data; -} mfxExtFeiHevcDistortion; -MFX_PACK_END() -#endif - enum { MFX_EXTBUFF_HEVCFEI_ENC_CTRL = MFX_MAKEFOURCC('F','H','C','T'), @@ -272,12 +141,6 @@ enum { MFX_EXTBUFF_HEVCFEI_ENC_CTU_CTRL = MFX_MAKEFOURCC('F','H','E','C'), MFX_EXTBUFF_HEVCFEI_REPACK_CTRL = MFX_MAKEFOURCC('F','H','R','P'), MFX_EXTBUFF_HEVCFEI_REPACK_STAT = MFX_MAKEFOURCC('F','H','R','S'), - -#if MFX_VERSION >= MFX_VERSION_NEXT - MFX_EXTBUFF_HEVCFEI_PAK_CTU_REC = MFX_MAKEFOURCC('F','H','T','B'), - MFX_EXTBUFF_HEVCFEI_PAK_CU_REC = MFX_MAKEFOURCC('F','H','C','U'), - MFX_EXTBUFF_HEVCFEI_ENC_DIST = MFX_MAKEFOURCC('F','H','D','S') -#endif }; #endif // MFX_VERSION diff --git a/api/include/mfxstructures.h b/api/include/mfxstructures.h index 6d233a089b..f86bd6063b 100644 --- a/api/include/mfxstructures.h +++ b/api/include/mfxstructures.h @@ -737,31 +737,6 @@ enum { MFX_P_REF_PYRAMID = 2 }; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - -/* QuantScaleType */ -enum { - MFX_MPEG2_QUANT_SCALE_TYPE_DEFAULT = 0, - MFX_MPEG2_QUANT_SCALE_TYPE_LINEAR = 1, /* q_scale_type = 0 */ - MFX_MPEG2_QUANT_SCALE_TYPE_NONLINEAR = 2 /* q_scale_type = 1 */ -}; - -/* IntraVLCFormat */ -enum { - MFX_MPEG2_INTRA_VLC_FORMAT_DEFAULT = 0, - MFX_MPEG2_INTRA_VLC_FORMAT_B14 = 1, /* use table B.14 */ - MFX_MPEG2_INTRA_VLC_FORMAT_B15 = 2 /* use table B.15 */ -}; - -/* ScanType */ -enum { - MFX_MPEG2_SCAN_TYPE_DEFAULT = 0, - MFX_MPEG2_SCAN_TYPE_ZIGZAG = 1, /* alternate_scan = 0 */ - MFX_MPEG2_SCAN_TYPE_ALTERNATE = 2 /* alternate_scan = 1 */ -}; - -#endif - MFX_PACK_BEGIN_USUAL_STRUCT() typedef struct { mfxExtBuffer Header; @@ -791,24 +766,14 @@ typedef struct { mfxU16 BitstreamRestriction; /* tri-state option */ mfxU16 LowDelayHrd; /* tri-state option */ mfxU16 MotionVectorsOverPicBoundaries; /* tri-state option */ -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxU16 Log2MaxMvLengthHorizontal; /* 0..16 */ - mfxU16 Log2MaxMvLengthVertical; /* 0..16 */ -#else mfxU16 reserved1[2]; -#endif mfxU16 ScenarioInfo; mfxU16 ContentInfo; mfxU16 PRefType; mfxU16 FadeDetection; /* tri-state option */ -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxI16 DeblockingAlphaTcOffset; /* -12..12 (slice_alpha_c0_offset_div2 << 1) */ - mfxI16 DeblockingBetaOffset; /* -12..12 (slice_beta_offset_div2 << 1) */ -#else mfxU16 reserved2[2]; -#endif mfxU16 GPB; /* tri-state option */ mfxU32 MaxFrameSizeI; @@ -822,11 +787,7 @@ typedef struct { mfxU16 NumRefActiveBL0[8]; mfxU16 NumRefActiveBL1[8]; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxU16 ConstrainedIntraPredFlag; /* tri-state option */ -#else mfxU16 reserved6; -#endif #if (MFX_VERSION >= 1026) mfxU16 TransformSkip; /* tri-state option; HEVC transform_skip_enabled_flag */ #else @@ -846,13 +807,7 @@ typedef struct { mfxU16 AdaptiveMaxFrameSize; /* tri-state option */ mfxU16 RepartitionCheckEnable; /* tri-state option */ -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxU16 QuantScaleType; /* For MPEG2 specifies mapping between quantiser_scale_code and quantiser_scale (see QuantScaleType enum) */ - mfxU16 IntraVLCFormat; /* For MPEG2 specifies which table shall be used for coding of DCT coefficients of intra macroblocks (see IntraVLCFormat enum) */ - mfxU16 ScanType; /* For MPEG2 specifies transform coefficients scan pattern (see ScanType enum) */ -#else mfxU16 reserved5[3]; -#endif #if (MFX_VERSION >= 1025) mfxU16 EncodedUnitsInfo; /* tri-state option */ mfxU16 EnableNalUnitType; /* tri-state option */ @@ -968,13 +923,6 @@ enum { #if (MFX_VERSION >= 1027) MFX_EXTBUFF_AVC_ROUNDING_OFFSET = MFX_MAKEFOURCC('R','N','D','O'), #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MFX_EXTBUFF_DPB = MFX_MAKEFOURCC('E','D','P','B'), - MFX_EXTBUFF_TEMPORAL_LAYERS = MFX_MAKEFOURCC('T','M','P','L'), - MFX_EXTBUFF_AVC_SCALING_MATRIX = MFX_MAKEFOURCC('A','V','S','M'), - MFX_EXTBUFF_MPEG2_QUANT_MATRIX = MFX_MAKEFOURCC('M','2','Q','M'), - MFX_EXTBUFF_TASK_DEPENDENCY = MFX_MAKEFOURCC('S','Y','N','C'), -#endif #if (MFX_VERSION >= 1031) MFX_EXTBUFF_PARTIAL_BITSTREAM_PARAM = MFX_MAKEFOURCC('P','B','O','P'), #endif @@ -1169,11 +1117,7 @@ typedef struct { mfxU32 reserved[3]; mfxMemId *mids; /* the array allocated by application */ mfxU16 NumFrameActual; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxU16 MemType; -#else mfxU16 reserved2; -#endif } mfxFrameAllocResponse; MFX_PACK_END() @@ -1224,9 +1168,6 @@ typedef enum { MFX_HANDLE_VA_CONFIG_ID = 6, MFX_HANDLE_VA_CONTEXT_ID = 7, #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - MFX_HANDLE_CM_DEVICE = 8 -#endif } mfxHandleType; typedef enum { @@ -1788,25 +1729,6 @@ typedef struct { } mfxExtMBDisableSkipMap; MFX_PACK_END() -#if (MFX_VERSION >= MFX_VERSION_NEXT) -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - mfxExtBuffer Header; - - mfxU16 DPBSize; - mfxU16 reserved[11]; - - struct { - mfxU32 FrameOrder; - mfxU16 PicType; - mfxU16 LongTermIdx; - mfxU16 reserved[4]; - } DPB[32]; -} mfxExtDPB; -MFX_PACK_END() - -#endif - /*GeneralConstraintFlags*/ enum { /* REXT Profile constraint flags*/ @@ -1944,29 +1866,6 @@ typedef struct { MFX_PACK_END() #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - mfxExtBuffer Header; - - mfxU16 reserved[12]; - - struct { - mfxU16 Scale; - mfxU16 QPI; - mfxU16 QPP; - mfxU16 QPB; - mfxU32 TargetKbps; - mfxU32 MaxKbps; - mfxU32 BufferSizeInKB; - mfxU32 InitialDelayInKB; - mfxU16 reserved1[20]; - } Layer[8]; -} mfxExtTemporalLayers; -MFX_PACK_END() - -#endif - MFX_PACK_BEGIN_USUAL_STRUCT() typedef struct { mfxExtBuffer Header; @@ -2005,50 +1904,6 @@ typedef struct { } mfxExtMoveRect; MFX_PACK_END() -#if (MFX_VERSION >= MFX_VERSION_NEXT) - -/* ScalingMatrixType */ -enum { - MFX_SCALING_MATRIX_SPS = 1, - MFX_SCALING_MATRIX_PPS = 2 -}; - -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - mfxExtBuffer Header; - - mfxU16 Type; - mfxU16 reserved[5]; - - /* [4x4_Intra_Y, 4x4_Intra_Cb, 4x4_Intra_Cr, - 4x4_Inter_Y, 4x4_Inter_Cb, 4x4_Inter_Cr, - 8x8_Intra_Y, 8x8_Inter_Y, 8x8_Intra_Cb, - 8x8_Inter_Cb, 8x8_Intra_Cr, 8x8_Inter_Cr] */ - mfxU8 ScalingListPresent[12]; - - /* [Intra_Y, Intra_Cb, Intra_Cr, - Inter_Y, Inter_Cb, Inter_Cr] */ - mfxU8 ScalingList4x4[6][16]; - - /* [Intra_Y, Inter_Y, Intra_Cb, - Inter_Cb, Intra_Cr, Inter_Cr] */ - mfxU8 ScalingList8x8[6][64]; -} mfxExtAVCScalingMatrix; -MFX_PACK_END() - -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - mfxExtBuffer Header; - - mfxU16 reserved[28]; - - mfxU8 LoadMatrix[4]; // [LumaIntra, LumaInter, ChromaIntra, ChromaInter] - mfxU8 Matrix[4][64]; // [LumaIntra, LumaInter, ChromaIntra, ChromaInter] -} mfxExtMPEG2QuantMatrix; -MFX_PACK_END() - -#endif - /* Angle */ enum { MFX_ANGLE_0 = 0, @@ -2114,26 +1969,6 @@ typedef struct { } mfxExtVPPScaling; MFX_PACK_END() -#if (MFX_VERSION >= MFX_VERSION_NEXT) - -/* SceneChangeType */ -enum { - MFX_SCENE_NO_CHANGE = 0, - MFX_SCENE_START = 1, - MFX_SCENE_END = 2 -}; - -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - mfxExtBuffer Header; - - mfxU16 Type; - mfxU16 reserved[11]; -} mfxExtSceneChange; -MFX_PACK_END() - -#endif - typedef mfxExtAVCRefListCtrl mfxExtHEVCRefListCtrl; typedef mfxExtAVCRefLists mfxExtHEVCRefLists; typedef mfxExtAvcTemporalLayers mfxExtHEVCTemporalLayers; @@ -2275,12 +2110,7 @@ typedef struct { mfxU16 WriteIVFHeaders; /* tri-state option */ -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxI16 LoopFilterRefDelta[4]; - mfxI16 LoopFilterModeDelta[2]; -#else // API 1.26 mfxI16 reserved1[6]; -#endif mfxI16 QIndexDeltaLumaDC; mfxI16 QIndexDeltaChromaAC; mfxI16 QIndexDeltaChromaDC; @@ -2357,32 +2187,13 @@ MFX_PACK_END() #endif #if (MFX_VERSION >= 1026) -#if (MFX_VERSION >= MFX_VERSION_NEXT) -/* MCTFTemporalMode */ -enum { - MFX_MCTF_TEMPORAL_MODE_UNKNOWN = 0, - MFX_MCTF_TEMPORAL_MODE_SPATIAL = 1, - MFX_MCTF_TEMPORAL_MODE_1REF = 2, - MFX_MCTF_TEMPORAL_MODE_2REF = 3, - MFX_MCTF_TEMPORAL_MODE_4REF = 4 -}; -#endif /* MCTF initialization & runtime */ MFX_PACK_BEGIN_USUAL_STRUCT() typedef struct { mfxExtBuffer Header; mfxU16 FilterStrength; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxU16 Overlap; /* tri-state option */ - mfxU32 BitsPerPixelx100k; - mfxU16 Deblocking; /* tri-state option */ - mfxU16 TemporalMode; - mfxU16 MVPrecision; - mfxU16 reserved[21]; -#else mfxU16 reserved[27]; -#endif } mfxExtVppMctf; MFX_PACK_END() diff --git a/api/include/mfxvp9.h b/api/include/mfxvp9.h index 7575f2a821..59c3001197 100644 --- a/api/include/mfxvp9.h +++ b/api/include/mfxvp9.h @@ -26,25 +26,6 @@ extern "C" { #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - -/* Extended Buffer Ids */ -enum { - MFX_EXTBUFF_VP9_DECODED_FRAME_INFO = MFX_MAKEFOURCC('9','D','F','I') -}; - -MFX_PACK_BEGIN_USUAL_STRUCT() -typedef struct { - mfxExtBuffer Header; - - mfxU16 DisplayWidth; - mfxU16 DisplayHeight; - mfxU16 reserved[58]; -} mfxExtVP9DecodedFrameInfo; -MFX_PACK_END() - -#endif - #ifdef __cplusplus } // extern "C" #endif diff --git a/api/mediasdk_structures/ts_ext_buffers_decl.h b/api/mediasdk_structures/ts_ext_buffers_decl.h index 9d82db5e2b..6e94c4b12b 100644 --- a/api/mediasdk_structures/ts_ext_buffers_decl.h +++ b/api/mediasdk_structures/ts_ext_buffers_decl.h @@ -76,10 +76,6 @@ EXTBUF(mfxExtVP9Param , MFX_EXTBUFF_VP9_PARAM EXTBUF(mfxExtEncoderIPCMArea , MFX_EXTBUFF_ENCODER_IPCM_AREA ) EXTBUF(mfxExtInsertHeaders , MFX_EXTBUFF_INSERT_HEADERS ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) -EXTBUF(mfxExtAVCScalingMatrix , MFX_EXTBUFF_AVC_SCALING_MATRIX ) -EXTBUF(mfxExtDPB , MFX_EXTBUFF_DPB ) -#endif #endif //defined(__MFXSTRUCTURES_H__) #if defined(__MFXFEI_H__) @@ -132,12 +128,6 @@ EXTBUF(mfxExtThreadsParam , MFX_EXTBUFF_THREADS_PARAM) EXTBUF(mfxExtScreenCaptureParam , MFX_EXTBUFF_SCREEN_CAPTURE_PARAM ) #endif //defined(__MFXSC_H__) -#if defined(__MFXVP9_H__) -#if (MFX_VERSION >= MFX_VERSION_NEXT) -EXTBUF(mfxExtVP9DecodedFrameInfo , MFX_EXTBUFF_VP9_DECODED_FRAME_INFO ) -#endif -#endif //defined(__MFXVP9_H__) - #if defined(__MFXBRC_H__) EXTBUF(mfxExtBRC, MFX_EXTBUFF_BRC) #endif // defined(__MFXBRC_H__) diff --git a/api/mediasdk_structures/ts_struct_decl.h b/api/mediasdk_structures/ts_struct_decl.h index 0a32fc10d8..2fe22ffd7e 100644 --- a/api/mediasdk_structures/ts_struct_decl.h +++ b/api/mediasdk_structures/ts_struct_decl.h @@ -835,63 +835,7 @@ STRUCT(mfxExtAVCRefLists, FIELD_S(mfxExtAVCRefLists_mfxRefPic, RefPicList1) ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) -STRUCT(mfxExtCodingOption3, - FIELD_S(mfxExtBuffer, Header) - FIELD_T(mfxU16, NumSliceI) - FIELD_T(mfxU16, NumSliceP) - FIELD_T(mfxU16, NumSliceB) - FIELD_T(mfxU16, WinBRCMaxAvgKbps) - FIELD_T(mfxU16, WinBRCSize) - FIELD_T(mfxU16, QVBRQuality) - FIELD_T(mfxU16, EnableMBQP) - FIELD_T(mfxU16, IntRefCycleDist) - FIELD_T(mfxU16, DirectBiasAdjustment) - FIELD_T(mfxU16, GlobalMotionBiasAdjustment)/* tri-state option */ - FIELD_T(mfxU16, MVCostScalingFactor) - FIELD_T(mfxU16, MBDisableSkipMap)/* tri-state option */ - FIELD_T(mfxU16, WeightedPred) - FIELD_T(mfxU16, WeightedBiPred) - FIELD_T(mfxU16, AspectRatioInfoPresent) /* tri-state option */ - FIELD_T(mfxU16, OverscanInfoPresent) /* tri-state option */ - FIELD_T(mfxU16, OverscanAppropriate) /* tri-state option */ - FIELD_T(mfxU16, TimingInfoPresent) /* tri-state option */ - FIELD_T(mfxU16, BitstreamRestriction) /* tri-state option */ - FIELD_T(mfxU16, LowDelayHrd) /* tri-state option */ - FIELD_T(mfxU16, MotionVectorsOverPicBoundaries) /* tri-state option */ - FIELD_T(mfxU16, Log2MaxMvLengthHorizontal) /* 0..16 */ - FIELD_T(mfxU16, Log2MaxMvLengthVertical) /* 0..16 */ - FIELD_T(mfxU16, ScenarioInfo) - FIELD_T(mfxU16, ContentInfo) - FIELD_T(mfxU16, PRefType) - FIELD_T(mfxU16, FadeDetection) /* tri-state option */ - FIELD_T(mfxI16, DeblockingAlphaTcOffset) /* -12..12 (slice_alpha_c0_offset_div2 << 1) */ - FIELD_T(mfxI16, DeblockingBetaOffset) /* -12..12 (slice_beta_offset_div2 << 1) */ - FIELD_T(mfxU16, GPB) - FIELD_T(mfxU32, MaxFrameSizeI) - FIELD_T(mfxU32, MaxFrameSizeP) - FIELD_T(mfxU16, EnableQPOffset) - FIELD_T(mfxI16, QPOffset) - FIELD_T(mfxU16, NumRefActiveP) - FIELD_T(mfxU16, NumRefActiveBL0) - FIELD_T(mfxU16, NumRefActiveBL1) - FIELD_T(mfxU16, TransformSkip) - FIELD_T(mfxU16, TargetChromaFormatPlus1) - FIELD_T(mfxU16, TargetBitDepthLuma) - FIELD_T(mfxU16, TargetBitDepthChroma) - FIELD_T(mfxU16, BRCPanicMode) - FIELD_T(mfxU16, LowDelayBRC) - FIELD_T(mfxU16, EnableMBForceIntra) - FIELD_T(mfxU16, AdaptiveMaxFrameSize) - FIELD_T(mfxU16, RepartitionCheckEnable) /* tri-state option */ - FIELD_T(mfxU16, QuantScaleType) - FIELD_T(mfxU16, IntraVLCFormat) - FIELD_T(mfxU16, ScanType) - FIELD_T(mfxU16, EncodedUnitsInfo) - FIELD_T(mfxU16, EnableNalUnitType) - FIELD_T(mfxU16, ExtBrcAdaptiveLTR) /* tri-state option for ExtBrcAdaptiveLTR */ -) -#elif (MFX_VERSION >= 1027) +#if (MFX_VERSION >= 1027) STRUCT(mfxExtCodingOption3, FIELD_S(mfxExtBuffer, Header) FIELD_T(mfxU16, NumSliceI) @@ -1189,18 +1133,7 @@ STRUCT(mfxExtMBDisableSkipMap, // FIELD_T(mfxU16 , VPSId) //) -#if (MFX_VERSION >= MFX_VERSION_NEXT) - -STRUCT(mfxExtHEVCParam, - FIELD_S(mfxExtBuffer , Header ) - FIELD_T(mfxU16 , PicWidthInLumaSamples ) - FIELD_T(mfxU16 , PicHeightInLumaSamples) - FIELD_T(mfxU64 , GeneralConstraintFlags) - FIELD_T(mfxU16 , SampleAdaptiveOffset) - FIELD_T(mfxU16 , LCUSize) -) - -#elif (MFX_VERSION >= 1026) +#if (MFX_VERSION >= 1026) STRUCT(mfxExtHEVCParam, FIELD_S(mfxExtBuffer, Header) @@ -1230,14 +1163,6 @@ STRUCT(mfxExtHEVCRegion, FIELD_T(mfxU16 , RegionEncoding) ) -#if (MFX_VERSION >= MFX_VERSION_NEXT) -STRUCT(mfxExtVP9DecodedFrameInfo, - FIELD_S(mfxExtBuffer, Header ) - //FIELD_T(mfxU16 , DisplayWidth) - //FIELD_T(mfxU16 , DisplayHeight) -) -#endif - #if (MFX_VERSION >= 1026) STRUCT(mfxVP9SegmentParam, FIELD_T(mfxU16, FeatureEnabled) @@ -1266,21 +1191,7 @@ STRUCT(mfxExtVP9TemporalLayers, ) #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) -STRUCT(mfxExtVP9Param, - FIELD_S(mfxExtBuffer, Header) - FIELD_T(mfxU16 , FrameWidth) - FIELD_T(mfxU16 , FrameHeight) - FIELD_T(mfxU16 , WriteIVFHeaders) - FIELD_T(mfxI16 , LoopFilterRefDelta) - FIELD_T(mfxI16 , LoopFilterModeDelta) - FIELD_T(mfxI16 , QIndexDeltaLumaDC) - FIELD_T(mfxI16 , QIndexDeltaChromaAC) - FIELD_T(mfxI16 , QIndexDeltaChromaDC) - FIELD_T(mfxU16 , NumTileRows) - FIELD_T(mfxU16 , NumTileColumns) -) -#elif (MFX_VERSION >= 1029) +#if (MFX_VERSION >= 1029) STRUCT(mfxExtVP9Param, FIELD_S(mfxExtBuffer, Header) FIELD_T(mfxU16 , FrameWidth) @@ -1391,22 +1302,10 @@ STRUCT(mfxExtSCD, #endif // defined(__MFXSCD_H__) #if (MFX_VERSION >= 1026) -#if (MFX_VERSION >= MFX_VERSION_NEXT) STRUCT(mfxExtVppMctf, FIELD_S(mfxExtBuffer, Header) FIELD_T(mfxU16, FilterStrength) - FIELD_T(mfxU16, Overlap) - FIELD_T(mfxU32, BitsPerPixelx100k) - FIELD_T(mfxU16, Deblocking) - FIELD_T(mfxU16, TemporalMode) - FIELD_T(mfxU16, MVPrecision) ) -#else -STRUCT(mfxExtVppMctf, - FIELD_S(mfxExtBuffer, Header) - FIELD_T(mfxU16, FilterStrength) -) -#endif #endif #if (MFX_VERSION >= 1034) diff --git a/api/mfx_dispatch/windows/src/main.cpp b/api/mfx_dispatch/windows/src/main.cpp index 7b8a107361..627e3dbc3c 100644 --- a/api/mfx_dispatch/windows/src/main.cpp +++ b/api/mfx_dispatch/windows/src/main.cpp @@ -67,13 +67,6 @@ namespace {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE4, 3}, {MFX_LIB_SOFTWARE, MFX_IMPL_SOFTWARE, 0}, {MFX_LIB_SOFTWARE, MFX_IMPL_SOFTWARE | MFX_IMPL_AUDIO, 0}, -#if (MFX_VERSION >= MFX_VERSION_NEXT) - //MFX_SINGLE_THREAD case - {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE | MFX_IMPL_EXTERNAL_THREADING, 0}, - {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE2 | MFX_IMPL_EXTERNAL_THREADING, 1}, - {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE3 | MFX_IMPL_EXTERNAL_THREADING, 2}, - {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE4 | MFX_IMPL_EXTERNAL_THREADING, 3}, -#endif }; const @@ -95,9 +88,6 @@ namespace {4, 4}, // MFX_IMPL_HARDWARE3 {5, 5}, // MFX_IMPL_HARDWARE4 {2, 6}, // MFX_IMPL_RUNTIME, same as MFX_IMPL_HARDWARE_ANY -#if (MFX_VERSION >= MFX_VERSION_NEXT) - {8, 11}, // MFX_SINGLE_THREAD, -#endif {7, 7} // MFX_IMPL_AUDIO }; @@ -212,10 +202,6 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) // implementation interface masked from the input parameter mfxIMPL implInterface = par.Implementation & -MFX_IMPL_VIA_ANY; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - bool isSingleThread = (implInterface & MFX_IMPL_EXTERNAL_THREADING) > 0; - implInterface &= ~MFX_IMPL_EXTERNAL_THREADING; -#endif mfxIMPL implInterfaceOrig = implInterface; mfxVersion requiredVersion = {{MFX_VERSION_MINOR, MFX_VERSION_MAJOR}}; @@ -225,11 +211,7 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) return MFX_ERR_NULL_PTR; } -#if (MFX_VERSION >= MFX_VERSION_NEXT) - if (((MFX_IMPL_AUTO > implMethod) || (MFX_IMPL_SINGLE_THREAD < implMethod)) && !(par.Implementation & MFX_IMPL_AUDIO)) -#else if (((MFX_IMPL_AUTO > implMethod) || (MFX_IMPL_RUNTIME < implMethod)) && !(par.Implementation & MFX_IMPL_AUDIO)) -#endif { return MFX_ERR_UNSUPPORTED; } @@ -259,11 +241,6 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) maxImplIdx = implTypesRange[implMethod].maxIndex; do { -#if (MFX_VERSION >= MFX_VERSION_NEXT) - if (isSingleThread && implTypes[curImplIdx].implType != MFX_LIB_HARDWARE) - continue; -#endif - int currentStorage = MFX::MFX_STORAGE_ID_FIRST; implInterface = implInterfaceOrig; do @@ -310,10 +287,6 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) DISPATCHER_LOG_INFO((("loading library %S\n"), dllName)); // try to load the selected DLL curImpl = implTypes[curImplIdx].impl; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - if (isSingleThread) - curImpl |= MFX_IMPL_EXTERNAL_THREADING; -#endif mfxRes = pHandle->LoadSelectedDLL(dllName, implType, curImpl, implInterface, par); // unload the failed DLL if (MFX_ERR_NONE != mfxRes) @@ -357,11 +330,6 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) // Load RT from app folder (libmfxsw64 with API >= 1.10) do { -#if (MFX_VERSION >= MFX_VERSION_NEXT) - if (isSingleThread && implTypes[curImplIdx].implType != MFX_LIB_HARDWARE) - continue; -#endif - implInterface = implInterfaceOrig; // initialize the library iterator mfxRes = libIterator.Init(implTypes[curImplIdx].implType, @@ -397,10 +365,6 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) // try to load the selected DLL curImpl = implTypes[curImplIdx].impl; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - if (isSingleThread) - curImpl |= MFX_IMPL_EXTERNAL_THREADING; -#endif mfxRes = pHandle->LoadSelectedDLL(dllName, implType, curImpl, implInterface, par); // unload the failed DLL if (MFX_ERR_NONE != mfxRes) @@ -429,11 +393,6 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) curImplIdx = implTypesRange[implMethod].minIndex; do { -#if (MFX_VERSION >= MFX_VERSION_NEXT) - if (isSingleThread && implTypes[curImplIdx].implType != MFX_LIB_HARDWARE) - continue; -#endif - implInterface = implInterfaceOrig; if (par.Implementation & MFX_IMPL_AUDIO) @@ -468,10 +427,6 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) if (MFX_ERR_NONE == mfxRes) { curImpl = implTypes[curImplIdx].impl; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - if (isSingleThread) - curImpl |= MFX_IMPL_EXTERNAL_THREADING; -#endif // try to load the selected DLL using default DLL search mechanism mfxRes = pHandle->LoadSelectedDLL(dllName, implTypes[curImplIdx].implType, @@ -908,9 +863,6 @@ mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session) switch (par.Implementation & 0xf) { case MFX_IMPL_SOFTWARE: -#if (MFX_VERSION >= MFX_VERSION_NEXT) - case MFX_IMPL_SINGLE_THREAD: -#endif return MFX_ERR_UNSUPPORTED; case MFX_IMPL_AUTO: case MFX_IMPL_HARDWARE: diff --git a/api/mfx_dispatch/windows/src/mfx_dispatcher.cpp b/api/mfx_dispatch/windows/src/mfx_dispatcher.cpp index d3b9c5a1c0..fe88c72d71 100644 --- a/api/mfx_dispatch/windows/src/mfx_dispatcher.cpp +++ b/api/mfx_dispatch/windows/src/mfx_dispatcher.cpp @@ -97,9 +97,6 @@ mfxStatus MFX_DISP_HANDLE::LoadSelectedDLL(const wchar_t *pPath, eMfxImplType re } // only exact types of implementation is allowed if (!(reqImpl & MFX_IMPL_AUDIO) && -#if (MFX_VERSION >= MFX_VERSION_NEXT) - !(reqImpl & MFX_IMPL_EXTERNAL_THREADING) && -#endif (MFX_IMPL_SOFTWARE != reqImpl) && (MFX_IMPL_HARDWARE != reqImpl) && (MFX_IMPL_HARDWARE2 != reqImpl) && diff --git a/api/mfx_dispatch/windows/src/mfx_library_iterator.cpp b/api/mfx_dispatch/windows/src/mfx_library_iterator.cpp index 9a2cfe2daf..9d56e0ec08 100644 --- a/api/mfx_dispatch/windows/src/mfx_library_iterator.cpp +++ b/api/mfx_dispatch/windows/src/mfx_library_iterator.cpp @@ -60,11 +60,7 @@ mfxStatus SelectImplementationType(const mfxU32 adapterNum, mfxIMPL *pImplInterf { return MFX_ERR_NULL_PTR; } -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxIMPL impl_via = (*pImplInterface & ~MFX_IMPL_EXTERNAL_THREADING); -#else mfxIMPL impl_via = *pImplInterface; -#endif DXVA2Device dxvaDevice; if (MFX_IMPL_VIA_D3D9 == impl_via) diff --git a/samples/sample_common/include/sample_defs.h b/samples/sample_common/include/sample_defs.h index a134bc6baa..f97b51095d 100644 --- a/samples/sample_common/include/sample_defs.h +++ b/samples/sample_common/include/sample_defs.h @@ -28,18 +28,8 @@ or https://software.intel.com/en-us/media-client-solutions-support. #include "vm/file_defs.h" #include "vm/time_defs.h" -// Run-time HSBC -// the condition below must be changed to MFX_VERSION >= 1027 after API is promoted to 1.27 -#if (MFX_VERSION >= MFX_VERSION_NEXT) -#define ENABLE_VPP_RUNTIME_HSBC -#endif - #if (MFX_VERSION >= 1026) #define ENABLE_MCTF -#if defined(MFX_VERSION_NEXT) && (MFX_VERSION >= MFX_VERSION_NEXT) -//---MCTF, extended interface -#undef ENABLE_MCTF_EXT -#endif enum {MCTF_BITRATE_MULTIPLIER = 100000}; #endif diff --git a/samples/sample_common/src/parameters_dumper.cpp b/samples/sample_common/src/parameters_dumper.cpp index 488f2362bf..ab86737023 100644 --- a/samples/sample_common/src/parameters_dumper.cpp +++ b/samples/sample_common/src/parameters_dumper.cpp @@ -357,12 +357,7 @@ void CParametersDumper::SerializeExtensionBuffer(msdk_ostream& sstr,msdk_string SERIALIZE_INFO(GPB); SERIALIZE_INFO(MaxFrameSizeI); SERIALIZE_INFO(MaxFrameSizeP); -#if (MFX_VERSION >= MFX_VERSION_NEXT) - SERIALIZE_INFO(Log2MaxMvLengthHorizontal); - SERIALIZE_INFO(Log2MaxMvLengthVertical); -#else SERIALIZE_INFO_ARRAY(reserved1); -#endif SERIALIZE_INFO(EnableQPOffset); SERIALIZE_INFO_ARRAY(QPOffset); SERIALIZE_INFO_ARRAY(NumRefActiveP); diff --git a/samples/sample_encode/include/pipeline_encode.h b/samples/sample_encode/include/pipeline_encode.h index 13efd0fb7d..edc5918589 100644 --- a/samples/sample_encode/include/pipeline_encode.h +++ b/samples/sample_encode/include/pipeline_encode.h @@ -228,11 +228,6 @@ struct sInputParams enum AtomISPMode MipiMode; #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - mfxI16 DeblockingAlphaTcOffset; - mfxI16 DeblockingBetaOffset; -#endif - }; diff --git a/samples/sample_encode/src/pipeline_encode.cpp b/samples/sample_encode/src/pipeline_encode.cpp index 5660e1b90e..d0a8a4935c 100644 --- a/samples/sample_encode/src/pipeline_encode.cpp +++ b/samples/sample_encode/src/pipeline_encode.cpp @@ -564,14 +564,6 @@ mfxStatus CEncodingPipeline::InitMfxEncParams(sInputParams *pInParams) hevcTiles->NumTileRows = pInParams->nEncTileRows; hevcTiles->NumTileColumns = pInParams->nEncTileCols; } -#if MFX_VERSION >= MFX_VERSION_NEXT - else if (m_mfxEncParams.mfx.CodecId == MFX_CODEC_VP9) - { - auto vp9Param = m_mfxEncParams.AddExtBuffer(); - vp9Param->NumTileRows = pInParams->nEncTileRows; - vp9Param->NumTileColumns = pInParams->nEncTileCols; - } -#endif } if (*pInParams->uSEI && (pInParams->CodecId == MFX_CODEC_AVC || pInParams->CodecId == MFX_CODEC_HEVC)) { @@ -706,9 +698,6 @@ mfxStatus CEncodingPipeline::InitMfxEncParams(sInputParams *pInParams) || pInParams->nPRefType || pInParams->IntRefCycleDist || pInParams->nAdaptiveMaxFrameSize || pInParams->nNumRefActiveP || pInParams->nNumRefActiveBL0 || pInParams->nNumRefActiveBL1 || pInParams->ExtBrcAdaptiveLTR || pInParams->QVBRQuality || pInParams->WinBRCSize -#if (MFX_VERSION >= MFX_VERSION_NEXT) - || pInParams->DeblockingAlphaTcOffset || pInParams->DeblockingBetaOffset -#endif || pInParams->WinBRCMaxAvgKbps || pInParams->nTransformSkip) { auto codingOption3 = m_mfxEncParams.AddExtBuffer(); @@ -738,13 +727,6 @@ mfxStatus CEncodingPipeline::InitMfxEncParams(sInputParams *pInParams) codingOption3->WinBRCSize = pInParams->WinBRCSize; codingOption3->WinBRCMaxAvgKbps = pInParams->WinBRCMaxAvgKbps; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - if (pInParams->DeblockingAlphaTcOffset || pInParams->DeblockingBetaOffset) - { - codingOption3->DeblockingAlphaTcOffset = pInParams->DeblockingAlphaTcOffset; - codingOption3->DeblockingBetaOffset = pInParams->DeblockingBetaOffset; - } -#endif } if (pInParams->nAvcTemp) diff --git a/samples/sample_encode/src/sample_encode.cpp b/samples/sample_encode/src/sample_encode.cpp index 8eb6bebbfc..d8ff1a8d16 100644 --- a/samples/sample_encode/src/sample_encode.cpp +++ b/samples/sample_encode/src/sample_encode.cpp @@ -176,10 +176,6 @@ void PrintHelp(msdk_char *strAppName, const msdk_char *strErrorMessage, ...) msdk_printf(MSDK_STRING(" [-qpfile ] - if specified, the encoder will take frame parameters (frame number, QP, frame type) from text file\n")); msdk_printf(MSDK_STRING(" [-usei] - insert user data unregistered SEI. eg: 7fc92488825d11e7bb31be2e44b06b34:0:MSDK (uuid:type<0-preifx/1-suffix>:message)\n")); msdk_printf(MSDK_STRING(" the suffix SEI for HEVCe can be inserted when CQP used or HRD disabled\n")); -#if (MFX_VERSION >= MFX_VERSION_NEXT) - msdk_printf(MSDK_STRING(" [-dblk_alpha] - alpha deblocking parameter. In range[-12,12]. 0 by default.\n")); - msdk_printf(MSDK_STRING(" [-dblk_beta] - beta deblocking parameter. In range[-12,12]. 0 by default.\n")); -#endif #if (MFX_VERSION >= 1024) msdk_printf(MSDK_STRING(" [-extbrc:] - External BRC for AVC and HEVC encoders\n")); #endif @@ -1096,26 +1092,6 @@ mfxStatus ParseInputString(msdk_char* strInput[], mfxU8 nArgNum, sInputParams* p { pParams->ExtBrcAdaptiveLTR = MFX_CODINGOPTION_OFF;; } -#endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) - else if(0 == msdk_strcmp(strInput[i], MSDK_STRING("-dblk_alpha"))) - { - VAL_CHECK(i + 1 >= nArgNum, i, strInput[i]); - if (MFX_ERR_NONE != msdk_opt_read(strInput[++i], pParams->DeblockingAlphaTcOffset)) - { - PrintHelp(strInput[0], MSDK_STRING("Alpha deblocking parameter is invalid")); - return MFX_ERR_UNSUPPORTED; - } - } - else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-dblk_beta"))) - { - VAL_CHECK(i + 1 >= nArgNum, i, strInput[i]); - if (MFX_ERR_NONE != msdk_opt_read(strInput[++i], pParams->DeblockingBetaOffset)) - { - PrintHelp(strInput[0], MSDK_STRING("Beta deblocking parameter is invalid")); - return MFX_ERR_UNSUPPORTED; - } - } #endif else if (0 == msdk_strcmp(strInput[i], MSDK_STRING("-pp"))) { diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 37a31a8c90..71e3049150 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2020 Intel Corporation +# Copyright (c) 2017-2021 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -18,7 +18,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -add_subdirectory(asg-hevc) -add_subdirectory(bs_parser_hevc) -add_subdirectory(bs_parser_hevc/tools/hevc_fei_extractor) +# Not viable w/o VERSION_NEXT +# add_subdirectory(asg-hevc) +# add_subdirectory(bs_parser_hevc) +# add_subdirectory(bs_parser_hevc/tools/hevc_fei_extractor) + add_subdirectory(tracer) diff --git a/tools/tracer/dumps/dump.cpp b/tools/tracer/dumps/dump.cpp index 949c470871..d56188435e 100644 --- a/tools/tracer/dumps/dump.cpp +++ b/tools/tracer/dumps/dump.cpp @@ -147,11 +147,6 @@ static IdTable g_BufferIdTable[] = TABLE_ENTRY(MFX_EXTBUFF_FEI_CODING_OPTION), TABLE_ENTRY(MFX_EXTBUFF_ENCODER_IPCM_AREA), TABLE_ENTRY(MFX_EXTBUFF_INSERT_HEADERS), -#if (MFX_VERSION >= MFX_VERSION_NEXT) - TABLE_ENTRY(MFX_EXTBUFF_VP9_SEGMENTATION), - TABLE_ENTRY(MFX_EXTBUFF_VP9_TEMPORAL_LAYERS), - TABLE_ENTRY(MFX_EXTBUFF_VP9_PARAM) -#endif }; static IdTable tbl_impl[] = { @@ -180,9 +175,6 @@ static IdTable tbl_fourcc[] = { TABLE_ENTRY(MFX_FOURCC_P8), TABLE_ENTRY(MFX_FOURCC_P8_TEXTURE), TABLE_ENTRY(MFX_FOURCC_P010), -#if (MFX_VERSION >= MFX_VERSION_NEXT) - TABLE_ENTRY(MFX_FOURCC_P016), -#endif TABLE_ENTRY(MFX_FOURCC_P210), TABLE_ENTRY(MFX_FOURCC_BGR4), TABLE_ENTRY(MFX_FOURCC_A2RGB10), @@ -199,11 +191,6 @@ static IdTable tbl_fourcc[] = { TABLE_ENTRY(MFX_FOURCC_NV21), TABLE_ENTRY(MFX_FOURCC_IYUV), TABLE_ENTRY(MFX_FOURCC_I010), -#if (MFX_VERSION >= MFX_VERSION_NEXT) - TABLE_ENTRY(MFX_FOURCC_Y216), - TABLE_ENTRY(MFX_FOURCC_Y416), - TABLE_ENTRY(MFX_FOURCC_RGBP), -#endif }; static IdTable tbl_sts[] = { diff --git a/tools/tracer/dumps/dump.h b/tools/tracer/dumps/dump.h index b1fd11e347..7e51a228de 100644 --- a/tools/tracer/dumps/dump.h +++ b/tools/tracer/dumps/dump.h @@ -700,15 +700,6 @@ class DumpContext DEFINE_DUMP_FUNCTION(mfxBRCFrameCtrl); DEFINE_DUMP_FUNCTION(mfxBRCFrameStatus); -#if (MFX_VERSION >= MFX_VERSION_NEXT) - //custom scaling matrices - DEFINE_DUMP_FUNCTION(mfxExtAVCScalingMatrix); -#endif - -#if (MFX_VERSION >= MFX_VERSION_NEXT) - //partial output - DEFINE_DUMP_FUNCTION(mfxExtPartialBitstreamParam); -#endif }; #endif //DUMP_H_ diff --git a/tools/tracer/dumps/dump_mfxstructures.cpp b/tools/tracer/dumps/dump_mfxstructures.cpp index b625e0d8ac..96b3c41bfa 100644 --- a/tools/tracer/dumps/dump_mfxstructures.cpp +++ b/tools/tracer/dumps/dump_mfxstructures.cpp @@ -176,23 +176,13 @@ std::string DumpContext::dump(const std::string structName, const mfxExtCodingOp DUMP_FIELD(BitstreamRestriction); DUMP_FIELD(LowDelayHrd); /* tri-state option */ DUMP_FIELD(MotionVectorsOverPicBoundaries); /* tri-state option */ -#if (MFX_VERSION >= MFX_VERSION_NEXT) - DUMP_FIELD(Log2MaxMvLengthHorizontal); /* 0..16 */ - DUMP_FIELD(Log2MaxMvLengthVertical); /* 0..16 */ -#else DUMP_FIELD_RESERVED(reserved1); -#endif DUMP_FIELD(ScenarioInfo); DUMP_FIELD(ContentInfo); DUMP_FIELD(PRefType); DUMP_FIELD(FadeDetection); -#if (MFX_VERSION >= MFX_VERSION_NEXT) - DUMP_FIELD(DeblockingAlphaTcOffset); - DUMP_FIELD(DeblockingBetaOffset); -#else DUMP_FIELD_RESERVED(reserved2); -#endif DUMP_FIELD(GPB); DUMP_FIELD(MaxFrameSizeI); DUMP_FIELD(MaxFrameSizeP); @@ -202,9 +192,6 @@ std::string DumpContext::dump(const std::string structName, const mfxExtCodingOp DUMP_FIELD_RESERVED(NumRefActiveBL0); DUMP_FIELD_RESERVED(NumRefActiveBL1); DUMP_FIELD(BRCPanicMode); -#if (MFX_VERSION >= MFX_VERSION_NEXT) - DUMP_FIELD(ConstrainedIntraPredFlag); -#endif #if (MFX_VERSION >= 1026) DUMP_FIELD(TransformSkip); #endif @@ -218,15 +205,8 @@ std::string DumpContext::dump(const std::string structName, const mfxExtCodingOp DUMP_FIELD(EnableMBForceIntra); DUMP_FIELD(AdaptiveMaxFrameSize); DUMP_FIELD(RepartitionCheckEnable); -#if (MFX_VERSION >= MFX_VERSION_NEXT) - DUMP_FIELD(QuantScaleType); - DUMP_FIELD(IntraVLCFormat); - DUMP_FIELD(ScanType); -#endif -#if ((MFX_VERSION < MFX_VERSION_NEXT) && (MFX_VERSION >= 1025)) - DUMP_FIELD_RESERVED(reserved5); -#endif #if (MFX_VERSION >= 1025) + DUMP_FIELD_RESERVED(reserved5); DUMP_FIELD(EncodedUnitsInfo); DUMP_FIELD(EnableNalUnitType); #endif @@ -293,11 +273,7 @@ std::string DumpContext::dump(const std::string structName, const mfxFrameAllocR else str += structName + ".mids=" + "NULL" + "\n"; str += structName + ".NumFrameActual=" + ToString(frameAllocResponse.NumFrameActual) + "\n"; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - str += structName + ".MemType=" + ToString(frameAllocResponse.MemType) + "\n"; -#else str += structName + ".reserved2=" + ToString(frameAllocResponse.reserved2) + "\n"; -#endif return str; } @@ -1428,13 +1404,6 @@ std::string DumpContext::dump(const std::string structName, const mfxExtVppMctf std::string str; str += dump(structName + ".Header", _struct.Header) + "\n"; str += structName + ".FilterStrength=" + ToString(_struct.FilterStrength) + "\n"; -#if (MFX_VERSION >= MFX_VERSION_NEXT) - str += structName + ".Overlap=" + ToString(_struct.Overlap) + "\n"; - str += structName + ".BitsPerPixelx100k=" + ToString(_struct.BitsPerPixelx100k) + "\n"; - str += structName + ".Deblocking=" + ToString(_struct.Deblocking) + "\n"; - str += structName + ".TemporalMode=" + ToString(_struct.TemporalMode) + "\n"; - str += structName + ".MVPrecision=" + ToString(_struct.MVPrecision) + "\n"; -#endif DUMP_FIELD_RESERVED(reserved); return str; } @@ -1509,10 +1478,6 @@ std::string DumpContext::dump(const std::string structName, const mfxExtVP9Para DUMP_FIELD(FrameWidth); DUMP_FIELD(FrameHeight); DUMP_FIELD(WriteIVFHeaders); -#if (MFX_VERSION >= MFX_VERSION_NEXT) - str += structName + ".LoopFilterRefDelta[4]=" + DUMP_RESERVED_ARRAY(_struct.LoopFilterRefDelta) + "\n"; - str += structName + ".LoopFilterModeDelta[2]=" + DUMP_RESERVED_ARRAY(_struct.LoopFilterModeDelta) + "\n"; -#endif DUMP_FIELD(QIndexDeltaLumaDC); DUMP_FIELD(QIndexDeltaChromaAC); DUMP_FIELD(QIndexDeltaChromaDC); @@ -1584,50 +1549,3 @@ std::string DumpContext::dump(const std::string structName, const mfxExtAV1FilmG } #endif -#if (MFX_VERSION >= MFX_VERSION_NEXT) -std::string DumpContext::dump(const std::string structName, const mfxExtAVCScalingMatrix &_struct) -{ - std::string str; - str += dump(structName + ".Header", _struct.Header) + "\n"; - DUMP_FIELD(Type); - - for (mfxU8 i = 0; i < 12; ++i) - { - str += dump(structName + ".ScalingListPresent[" + ToString(i) + "]", _struct.ScalingListPresent[i]) + "\n"; - } - - for (mfxU8 i = 0; i < 6; ++i) - { - for(mfxU8 y = 0; y < 4; ++y) - for (mfxU8 x = 0; x < 4; ++x) - { - str += dump(structName + ".ScalingList4x4[" + ToString(i) + "][" + ToString(y) + "][" + ToString(x) + "]", _struct.ScalingList4x4[i][y * 4+x]) + "\n"; - } - } - - for (mfxU8 i = 0; i < 6; ++i) - { - for (mfxU8 y = 0; y < 8; ++y) - for (mfxU8 x = 0; x < 8; ++x) - { - str += dump(structName + ".ScalingList8x8[" + ToString(i) + "][" + ToString(y) + "][" + ToString(x) + "]", _struct.ScalingList8x8[i][y * 4 + x]) + "\n"; - } - } - - return str; -} -#endif - -#if (MFX_VERSION >= MFX_VERSION_NEXT) -std::string DumpContext::dump(const std::string structName, const mfxExtPartialBitstreamParam &_struct) -{ - std::string str; - str += dump(structName + ".Header", _struct.Header) + "\n"; - DUMP_FIELD(BlockSize); - DUMP_FIELD(Granularity); - - str += structName + ".reserved[]=" + DUMP_RESERVED_ARRAY(_struct.reserved) + "\n"; - - return str; -} -#endif