Skip to content

Commit

Permalink
Fix build errors in clang
Browse files Browse the repository at this point in the history
  • Loading branch information
jinyuan-dev committed Jul 25, 2024
1 parent eff7c6f commit e278d72
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion _studio/mfx_lib/vpp/src/mfx_vpp_ai_frame_interpolation.cpp
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
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
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
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

0 comments on commit e278d72

Please sign in to comment.