Skip to content
This repository has been archived by the owner on May 17, 2023. It is now read-only.

API 1.35 - remove VERSION_NEXT #2634

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

API 1.35 - remove VERSION_NEXT #2634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion _studio/mfx_lib/encode_hw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
74 changes: 0 additions & 74 deletions _studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.cpp
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions _studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_dpb_report.h
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions _studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down Expand Up @@ -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<mfxI16>(pCO3->DeblockingAlphaTcOffset, -12, 12, 0);
changed += CheckRangeOrSetDefault<mfxI16>(pCO3->DeblockingBetaOffset, -12, 12, 0);
#endif
}

MFX_CHECK(!changed, MFX_WRN_INCOMPATIBLE_VIDEO_PARAM);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions _studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy_defaults.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions _studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_fei_lin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,9 @@ void FEI::InitAlloc(const FeatureBlocks& /*blocks*/, TPushIA Push)
}

// Output buffers
#if MFX_VERSION >= MFX_VERSION_NEXT
vaFrameCtrl.ctb_cmd = GetVaBufferID<mfxExtFeiHevcPakCtuRecordV0>(task.pBsOut, MFX_EXTBUFF_HEVCFEI_PAK_CTU_REC);
vaFrameCtrl.cu_record = GetVaBufferID<mfxExtFeiHevcPakCuRecordV0>(task.pBsOut, MFX_EXTBUFF_HEVCFEI_PAK_CU_REC);
vaFrameCtrl.distortion = GetVaBufferID<mfxExtFeiHevcDistortion>(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;
});
Expand Down
16 changes: 5 additions & 11 deletions _studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_lin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -123,11 +117,11 @@ ImplBase* Linux::Base::MFXVideoENCODEH265_HW::ApplyMode(mfxU32 mode)

if (bInitFEI)
{
mfxU32 featureMode =
(QUERY0 * !BQ<BQ_Query0>::Get(*this).empty())
+ (QUERY1 * !BQ<BQ_Query1NoCaps>::Get(*this).empty())
+ (QUERY_IO_SURF * !BQ<BQ_QueryIOSurf>::Get(*this).empty())
+ (INIT * !BQ<BQ_InitAlloc>::Get(*this).empty())
mfxU32 featureMode =
(QUERY0 * !BQ<BQ_Query0>::Get(*this).empty())
+ (QUERY1 * !BQ<BQ_Query1NoCaps>::Get(*this).empty())
+ (QUERY_IO_SURF * !BQ<BQ_QueryIOSurf>::Get(*this).empty())
+ (INIT * !BQ<BQ_InitAlloc>::Get(*this).empty())
+ (RUNTIME * !BQ<BQ_SubmitTask>::Get(*this).empty());

m_features.emplace_back(new FEI(FEATURE_FEI));
Expand Down
9 changes: 0 additions & 9 deletions _studio/mfx_lib/shared/src/mfx_common_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need keep these format for SFC CSC. Just sync with @shawnli2, we need use #if (MFX_VERSION >= 1031) instead of #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;
Expand Down
7 changes: 0 additions & 7 deletions _studio/shared/include/mfx_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,13 @@
#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

#if defined(MFX_ENABLE_ASC)
#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
Expand Down
Loading