Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix VVC decode build errors in clang #347

Merged
merged 1 commit into from
Jul 26, 2024
Merged

Fix VVC decode build errors in clang #347

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
2 changes: 1 addition & 1 deletion _studio/mfx_lib/vpp/src/mfx_vpp_ai_frame_interpolation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ mfxStatus MFXVideoFrameInterpolation::InitScd(const mfxFrameInfo& inFrameInfo, c
bool MFXVideoFrameInterpolation::IsVppNeededForVfi(const mfxFrameInfo& inInfo, const mfxFrameInfo& outInfo)
{
// kernel only support RGB
if (outInfo.FourCC != MFX_FOURCC_RGB4 ||
if (outInfo.FourCC != MFX_FOURCC_RGB4 &&
outInfo.FourCC != MFX_FOURCC_BGR4)
{
return true;
Expand Down
2 changes: 2 additions & 0 deletions _studio/shared/umc/codec/vvc_dec/include/umc_vvc_au_splitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ namespace UMC_VVC_DECODER
{
public:

virtual ~Splitter_VVC() = default;

void Reset()
{
m_iCodeSearcher.Reset();
Expand Down
24 changes: 12 additions & 12 deletions _studio/shared/umc/codec/vvc_dec/include/umc_vvc_dec_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,23 +373,23 @@ namespace UMC_VVC_DECODER
// Scaling list initialization scan lookup table
static ScanElement sigLastScanCG32x32[64] =
{
0, 8, 1, 16, 9, 2, 24, 17,
10, 3, 32, 25, 18, 11, 4, 40,
33, 26, 19, 12, 5, 48, 41, 34,
27, 20, 13, 6, 56, 49, 42, 35,
28, 21, 14, 7, 57, 50, 43, 36,
29, 22, 15, 58, 51, 44, 37, 30,
23, 59, 52, 45, 38, 31, 60, 53,
46, 39, 61, 54, 47, 62, 55, 63
{0}, {8}, {1}, {16}, {9}, {2}, {24}, {17},
{10}, {3}, {32}, {25}, {18}, {11}, {4}, {40},
{33}, {26}, {19}, {12}, {5}, {48}, {41}, {34},
{27}, {20}, {13}, {6}, {56}, {49}, {42}, {35},
{28}, {21}, {14}, {7}, {57}, {50}, {43}, {36},
{29}, {22}, {15}, {58}, {51}, {44}, {37}, {30},
{23}, {59}, {52}, {45}, {38}, {31}, {60}, {53},
{46}, {39}, {61}, {54}, {47}, {62}, {55}, {63}
};

// Scaling list initialization scan lookup table
static ScanElement ScanTableDiag4x4[16] =
{
0, 4, 1, 8,
5, 2, 12, 9,
6, 3, 13, 10,
7, 14, 11, 15
{0}, {4}, {1}, {8},
{5}, {2}, {12}, {9},
{6}, {3}, {13}, {10},
{7}, {14}, {11}, {15}
};
// Default scaling list 4x4
static const int quantTSDefault4x4[4 * 4] =
Expand Down
4 changes: 2 additions & 2 deletions _studio/shared/umc/codec/vvc_dec/include/umc_vvc_va_packer_vaapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ namespace UMC_VVC_DECODER
{
public:
PackerVA(UMC::VideoAccelerator * va);
void PackAU(VVCDecoderFrame *pFrame, DPBType dpb);
void PackAU(VVCDecoderFrame *pFrame, DPBType dpb) override;

UMC::Status GetStatusReport(void * pStatusReport, size_t size) override;
UMC::Status SyncTask(int32_t index, void * error);
UMC::Status SyncTask(int32_t index, void * error) override;
UMC::Status QueryTaskStatus(int32_t index, void * status, void * error);

void BeginFrame() override;
Expand Down