History

make the decoder compile and run with treason

Sigrid Solveig Haflínudóttir committed 5 years ago

Commit 37423d41 parent be8e62f71 files · +961 −1217Browse files

Showing the changes to codec/decoder/core/src/deblocking.cpp (1 of 71 files). Show all

Unified · Split

codec/decoder/core/src/deblocking.cpp+28−25
@@ -42,8 +42,6 @@ · 41 unmodified lines
4242 #include "deblocking_common.h"
4343 #include "cpu_core.h"
4444
45−namespace WelsDec {
46−
4745 #define NO_SUPPORTED_FILTER_IDX (-1)
4846 #define LEFT_FLAG_BIT 0
4947 #define TOP_FLAG_BIT 1
@@ -672,8 +670,8 @@ int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterId · 622 unmodified lines
672670 int32_t iMbY = pCurDqLayer->iMbY;
673671 int32_t iMbX = pCurDqLayer->iMbX;
674672 int32_t iMbXy = pCurDqLayer->iMbXyIndex;
675− bool bLeftFlag = false;
676− bool bTopFlag = false;
673+ bool bLeftFlag;
674+ bool bTopFlag;
677675
678676 if (2 == iFilterIdc) {
679677 bLeftFlag = (iMbX > 0) && (pCurDqLayer->pSliceIdc[iMbXy] == pCurDqLayer->pSliceIdc[iMbXy - 1]);
@@ -720,6 +718,7 @@ void FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStr · 40 unmodified lines
720718
721719
722720 void FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
721+ USED(pBS);
723722 int32_t iIndexA;
724723 int32_t iAlpha;
725724 int32_t iBeta;
@@ -734,6 +733,7 @@ void FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t · 8 unmodified lines
734733 }
735734
736735 void FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
736+ USED(pBS);
737737 int32_t iIndexA;
738738 int32_t iAlpha;
739739 int32_t iBeta;
@@ -748,6 +748,7 @@ void FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t · 8 unmodified lines
748748 }
749749 void FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
750750 uint8_t* pBS) {
751+ USED(pBS);
751752 int32_t iIndexA;
752753 int32_t iAlpha;
753754 int32_t iBeta;
@@ -821,6 +822,7 @@ void FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* · 67 unmodified lines
821822
822823 void FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
823824 uint8_t* pBS) {
825+ USED(pBS);
824826 int32_t iIndexA;
825827 int32_t iAlpha;
826828 int32_t iBeta;
@@ -851,6 +853,7 @@ void FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uin · 24 unmodified lines
851853
852854 void FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
853855 uint8_t* pBS) {
856+ USED(pBS);
854857 int32_t iIndexA;
855858 int32_t iAlpha;
856859 int32_t iBeta;
@@ -1221,7 +1224,7 @@ void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFun · 364 unmodified lines
12211224 SDeblockingFilter pFilter;
12221225 memset (&pFilter, 0, sizeof (pFilter));
12231226 PFmo pFmo = pCtx->pFmo;
1224− int32_t iNextMbXyIndex = 0;
1227+ int32_t iNextMbXyIndex;
12251228 int32_t iTotalNumMb = pCurDqLayer->sLayerInfo.sSliceInLayer.iTotalMbInCurSlice;
12261229 int32_t iCountNumMb = 0;
12271230 int32_t iBoundryFlag;
@@ -1285,30 +1288,30 @@ void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFun · 57 unmodified lines
12851288 *
12861289 * \return NONE
12871290 */
1288−void WelsDeblockingInitFilter (PWelsDecoderContext pCtx, SDeblockingFilter& pFilter, int32_t& iFilterIdc) {
1291+void WelsDeblockingInitFilter (PWelsDecoderContext pCtx, SDeblockingFilter *pFilter, int32_t *iFilterIdc) {
12891292 PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
12901293 PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;
12911294
1292− memset (&pFilter, 0, sizeof (pFilter));
1295+ memset (pFilter, 0, sizeof (*pFilter));
12931296
1294− iFilterIdc = pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.uiDisableDeblockingFilterIdc;
1297+ *iFilterIdc = pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.uiDisableDeblockingFilterIdc;
12951298
12961299 /* Step1: parameters set */
1297− pFilter.pCsData[0] = pCtx->pDec->pData[0];
1298− pFilter.pCsData[1] = pCtx->pDec->pData[1];
1299− pFilter.pCsData[2] = pCtx->pDec->pData[2];
1300+ pFilter->pCsData[0] = pCtx->pDec->pData[0];
1301+ pFilter->pCsData[1] = pCtx->pDec->pData[1];
1302+ pFilter->pCsData[2] = pCtx->pDec->pData[2];
13001303
1301− pFilter.iCsStride[0] = pCtx->pDec->iLinesize[0];
1302− pFilter.iCsStride[1] = pCtx->pDec->iLinesize[1];
1304+ pFilter->iCsStride[0] = pCtx->pDec->iLinesize[0];
1305+ pFilter->iCsStride[1] = pCtx->pDec->iLinesize[1];
13031306
1304− pFilter.eSliceType = (EWelsSliceType)pCurDqLayer->sLayerInfo.sSliceInLayer.eSliceType;
1307+ pFilter->eSliceType = (EWelsSliceType)pCurDqLayer->sLayerInfo.sSliceInLayer.eSliceType;
13051308
1306− pFilter.iSliceAlphaC0Offset = pSliceHeaderExt->sSliceHeader.iSliceAlphaC0Offset;
1307− pFilter.iSliceBetaOffset = pSliceHeaderExt->sSliceHeader.iSliceBetaOffset;
1309+ pFilter->iSliceAlphaC0Offset = pSliceHeaderExt->sSliceHeader.iSliceAlphaC0Offset;
1310+ pFilter->iSliceBetaOffset = pSliceHeaderExt->sSliceHeader.iSliceBetaOffset;
13081311
1309− pFilter.pLoopf = &pCtx->sDeblockingFunc;
1310− pFilter.pRefPics[0] = pCtx->sRefPic.pRefList[0];
1311− pFilter.pRefPics[1] = pCtx->sRefPic.pRefList[1];
1312+ pFilter->pLoopf = &pCtx->sDeblockingFunc;
1313+ pFilter->pRefPics[0] = pCtx->sRefPic.pRefList[0];
1314+ pFilter->pRefPics[1] = pCtx->sRefPic.pRefList[1];
13121315 }
13131316
13141317 /*!
@@ -1318,12 +1321,12 @@ void WelsDeblockingInitFilter (PWelsDecoderContext pCtx, SDeblockingFilter& pFil · 3 unmodified lines
13181321 *
13191322 * \return NONE
13201323 */
1321−void WelsDeblockingFilterMB (PDqLayer pCurDqLayer, SDeblockingFilter& pFilter, int32_t& iFilterIdc,
1324+void WelsDeblockingFilterMB (PDqLayer pCurDqLayer, SDeblockingFilter *pFilter, int32_t *iFilterIdc,
13221325 PDeblockingFilterMbFunc pDeblockMb) {
13231326 /* macroblock deblocking */
1324− if (0 == iFilterIdc || 2 == iFilterIdc) {
1325− int32_t iBoundryFlag = DeblockingAvailableNoInterlayer (pCurDqLayer, iFilterIdc);
1326− pDeblockMb (pCurDqLayer, &pFilter, iBoundryFlag);
1327+ if (0 == *iFilterIdc || 2 == *iFilterIdc) {
1328+ int32_t iBoundryFlag = DeblockingAvailableNoInterlayer (pCurDqLayer, *iFilterIdc);
1329+ pDeblockMb (pCurDqLayer, pFilter, iBoundryFlag);
13271330 }
13281331 }
13291332 /*!
@@ -1336,6 +1339,8 @@ void WelsDeblockingFilterMB (PDqLayer pCurDqLayer, SDeblockingFilter& pFilter, i · 6 unmodified lines
13361339 */
13371340
13381341 void DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {
1342+ USED(iCpu);
1343+
13391344 pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_c;
13401345 pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_c;
13411346 pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_c;
@@ -1418,5 +1423,3 @@ void DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) { · 76 unmodified lines
14181423 }
14191424 #endif//HAVE_MSA
14201425 }
1421−
1422−} // namespace WelsDec

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t