generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #788 from mstorsjo/factorize-duplicated-test

Browse Source 
Avoid duplicating code in the MotionEstimate test

Approved by Sijia.
This commit is contained in:
volvet 2014-05-06 15:00:01 +08:00
commit 9a74427a61
1 changed files with 33 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
test/encoder/EncUT_MotionEstimate.cpp
View File

@ -63,6 +63,7 @@ public:
m_pMvdCostTable=new uint16_t[52*m_uiMvdTableSize]; m_pMvdCostTable=new uint16_t[52*m_uiMvdTableSize];
ASSERT_TRUE( NULL != m_pMvdCostTable ); ASSERT_TRUE( NULL != m_pMvdCostTable );
} }
void DoLineTest(PLineFullSearchFunc func, bool horizontal);
virtual void TearDown() { virtual void TearDown() {
delete [] m_pMvdCostTable; delete [] m_pMvdCostTable;
pMa->WelsFree( m_pRefData, "RefPic"); pMa->WelsFree( m_pRefData, "RefPic");
@ -135,7 +136,7 @@ TEST_F(MotionEstimateTest, TestDiamondSearch) {
} }
TEST_F(MotionEstimateTest, TestVerticalSearch) { void MotionEstimateTest::DoLineTest(PLineFullSearchFunc func, bool vertical) {
const int32_t kiMaxBlock16Sad = 72000;//a rough number const int32_t kiMaxBlock16Sad = 72000;//a rough number
SWelsFuncPtrList sFuncList; SWelsFuncPtrList sFuncList;
SWelsME sMe; SWelsME sMe;
@ -146,6 +147,7 @@ TEST_F(MotionEstimateTest, TestVerticalSearch) {
SMVUnitXY sTargetMv; SMVUnitXY sTargetMv;
WelsInitSampleSadFunc( &sFuncList, 0 );//test c functions WelsInitSampleSadFunc( &sFuncList, 0 );//test c functions
WelsInitMeFunc(&sFuncList, WelsCPUFeatureDetect(NULL), 1);
uint8_t *pRefPicCenter = m_pRefData+(m_iHeight/2)*m_iWidth+(m_iWidth/2); uint8_t *pRefPicCenter = m_pRefData+(m_iHeight/2)*m_iWidth+(m_iWidth/2);
sMe.iCurMeBlockPixX = (m_iWidth/2); sMe.iCurMeBlockPixX = (m_iWidth/2);
@ -155,8 +157,13 @@ TEST_F(MotionEstimateTest, TestVerticalSearch) {
bool bFoundMatch = false; bool bFoundMatch = false;
int32_t iTryTimes=100; int32_t iTryTimes=100;
sTargetMv.iMvX = 0; if (vertical) {
sTargetMv.iMvY = -sMe.iCurMeBlockPixY + INTPEL_NEEDED_MARGIN + rand()%(m_iHeight - 16 - 2*INTPEL_NEEDED_MARGIN); sTargetMv.iMvX = 0;
sTargetMv.iMvY = -sMe.iCurMeBlockPixY + INTPEL_NEEDED_MARGIN + rand()%(m_iHeight - 16 - 2*INTPEL_NEEDED_MARGIN);
} else {
sTargetMv.iMvX = -sMe.iCurMeBlockPixX + INTPEL_NEEDED_MARGIN + rand()%(m_iWidth - 16 - 2*INTPEL_NEEDED_MARGIN);
sTargetMv.iMvY = 0;
}
bDataGeneratorSucceed = false; bDataGeneratorSucceed = false;
bFoundMatch = false; bFoundMatch = false;
while (!bFoundMatch && (iTryTimes--)>0) { while (!bFoundMatch && (iTryTimes--)>0) {
@ -179,16 +186,24 @@ TEST_F(MotionEstimateTest, TestVerticalSearch) {
const int32_t iCurMeBlockQpelPixY = ((iCurMeBlockPixY)<<2); const int32_t iCurMeBlockQpelPixY = ((iCurMeBlockPixY)<<2);
uint16_t* pMvdCostX = sMe.pMvdCost - iCurMeBlockQpelPixX - sMe.sMvp.iMvX; //do the offset here uint16_t* pMvdCostX = sMe.pMvdCost - iCurMeBlockQpelPixX - sMe.sMvp.iMvX; //do the offset here
uint16_t* pMvdCostY = sMe.pMvdCost - iCurMeBlockQpelPixY - sMe.sMvp.iMvY; uint16_t* pMvdCostY = sMe.pMvdCost - iCurMeBlockQpelPixY - sMe.sMvp.iMvY;
LineFullSearch_c ( &sFuncList, &sMe, uint16_t* pMvdCost = vertical ? pMvdCostY : pMvdCostX;
pMvdCostY, pMvdCostX[ iCurMeBlockQpelPixX ], int iSize = vertical ? m_iHeight : m_iWidth;
m_iMaxSearchBlock, m_iWidth, int iFixedMvd = vertical ? pMvdCostX[ iCurMeBlockQpelPixX ] : pMvdCostY[ iCurMeBlockQpelPixY ];
INTPEL_NEEDED_MARGIN, func ( &sFuncList, &sMe,
m_iHeight-INTPEL_NEEDED_MARGIN-16, true ); pMvdCost, iFixedMvd,
m_iMaxSearchBlock, m_iWidth,
INTPEL_NEEDED_MARGIN,
iSize-INTPEL_NEEDED_MARGIN-16, vertical );
//the last selection may be affected by MVDcost, that is when smaller MvY will be better //the last selection may be affected by MVDcost, that is when smaller MvY will be better
bFoundMatch = (sMe.sMv.iMvX==0 if (vertical) {
&&(sMe.sMv.iMvY==sTargetMv.iMvY||abs(sMe.sMv.iMvY)<abs(sTargetMv.iMvY))); bFoundMatch = (sMe.sMv.iMvX==0
//printf("TestVerticalSearch Target: %d,%d\n", sTargetMv.iMvX, sTargetMv.iMvY); &&(sMe.sMv.iMvY==sTargetMv.iMvY||abs(sMe.sMv.iMvY)<abs(sTargetMv.iMvY)));
} else {
bFoundMatch = (sMe.sMv.iMvY==0
&&(sMe.sMv.iMvX==sTargetMv.iMvX||abs(sMe.sMv.iMvX)<abs(sTargetMv.iMvX)));
}
//printf("DoLineTest Target: %d,%d\n", sTargetMv.iMvX, sTargetMv.iMvY);
} }
if (bDataGeneratorSucceed) { if (bDataGeneratorSucceed) {
//if DataGenerator never succeed, there is no meaning to check iTryTimes //if DataGenerator never succeed, there is no meaning to check iTryTimes
@ -196,199 +211,31 @@ TEST_F(MotionEstimateTest, TestVerticalSearch) {
//it is possible that ref at differnt position is identical, but that should be under a low probability //it is possible that ref at differnt position is identical, but that should be under a low probability
} }
} }
TEST_F(MotionEstimateTest, TestVerticalSearch) {
DoLineTest(LineFullSearch_c, true);
}
TEST_F(MotionEstimateTest, TestHorizontalSearch) { TEST_F(MotionEstimateTest, TestHorizontalSearch) {
const int32_t kiMaxBlock16Sad = 72000;//a rough number DoLineTest(LineFullSearch_c, false);
SWelsFuncPtrList sFuncList;
SWelsME sMe;
srand((uint32_t)time(NULL));
const uint8_t kuiQp = rand()%52;
InitMe(kuiQp, 648, m_uiMvdTableSize, m_pMvdCostTable, &sMe);
SMVUnitXY sTargetMv;
WelsInitSampleSadFunc( &sFuncList, 0 );//test c functions
uint8_t *pRefPicCenter = m_pRefData+(m_iHeight/2)*m_iWidth+(m_iWidth/2);
sMe.iCurMeBlockPixX = (m_iWidth/2);
sMe.iCurMeBlockPixY = (m_iHeight/2);
bool bDataGeneratorSucceed = false;
bool bFoundMatch = false;
int32_t iTryTimes=100;
sTargetMv.iMvX = -sMe.iCurMeBlockPixX + INTPEL_NEEDED_MARGIN + rand()%(m_iWidth - 16 - 2*INTPEL_NEEDED_MARGIN);
sTargetMv.iMvY = 0;
bDataGeneratorSucceed = false;
bFoundMatch = false;
while (!bFoundMatch && (iTryTimes--)>0) {
if (!YUVPixelDataGenerator( m_pRefData, m_iWidth, m_iHeight, m_iWidth ))
continue;
bDataGeneratorSucceed = true;
CopyTargetBlock( m_pSrcBlock, 16, sTargetMv, m_iWidth, pRefPicCenter);
//clean the sMe status
sMe.uiBlockSize = rand()%5;
sMe.pEncMb = m_pSrcBlock;
sMe.pRefMb = pRefPicCenter;
sMe.pColoRefMb = pRefPicCenter;
sMe.sMv.iMvX = sMe.sMv.iMvY = 0;
sMe.uiSadCost = sMe.uiSatdCost = kiMaxBlock16Sad;
const int32_t iCurMeBlockPixX = sMe.iCurMeBlockPixX;
const int32_t iCurMeBlockQpelPixX = ((iCurMeBlockPixX)<<2);
const int32_t iCurMeBlockPixY = sMe.iCurMeBlockPixY;
const int32_t iCurMeBlockQpelPixY = ((iCurMeBlockPixY)<<2);
uint16_t* pMvdCostX = sMe.pMvdCost - iCurMeBlockQpelPixX - sMe.sMvp.iMvX; //do the offset here
uint16_t* pMvdCostY = sMe.pMvdCost - iCurMeBlockQpelPixY - sMe.sMvp.iMvY;
LineFullSearch_c ( &sFuncList, &sMe,
pMvdCostX, pMvdCostY[ iCurMeBlockQpelPixY ],
m_iMaxSearchBlock, m_iWidth,
INTPEL_NEEDED_MARGIN,
m_iWidth-INTPEL_NEEDED_MARGIN-16, false );
//the last selection may be affected by MVDcost, that is when smaller MvY will be better
bFoundMatch = (sMe.sMv.iMvY==0
&&(sMe.sMv.iMvX==sTargetMv.iMvX||abs(sMe.sMv.iMvX)<abs(sTargetMv.iMvX)));
//printf("TestHorizontalSearch Target: %d,%d\n", sTargetMv.iMvX, sTargetMv.iMvY);
}
if (bDataGeneratorSucceed) {
//if DataGenerator never succeed, there is no meaning to check iTryTimes
ASSERT_TRUE(iTryTimes > 0);
//it is possible that ref at differnt position is identical, but that should be under a low probability
}
} }
#ifdef X86_ASM #ifdef X86_ASM
TEST_F(MotionEstimateTest, TestVerticalSearch_SSE41) TEST_F(MotionEstimateTest, TestVerticalSearch_SSE41)
{ {
const int32_t kiMaxBlock16Sad = 72000;//a rough number
SWelsFuncPtrList sFuncList;
SWelsME sMe;
srand((uint32_t)time(NULL));
const uint8_t kuiQp = rand()%52;
InitMe(kuiQp, 648, m_uiMvdTableSize, m_pMvdCostTable, &sMe);
int32_t iTmp = 1; int32_t iTmp = 1;
uint32_t uiCPUFlags = WelsCPUFeatureDetect( &iTmp); uint32_t uiCPUFlags = WelsCPUFeatureDetect( &iTmp);
if ((uiCPUFlags & WELS_CPU_SSE41) == 0) return ; if ((uiCPUFlags & WELS_CPU_SSE41) == 0) return ;
SMVUnitXY sTargetMv; DoLineTest(VerticalFullSearchUsingSSE41, true);
WelsInitSampleSadFunc( &sFuncList, 0 );//test c functions
WelsInitMeFunc(&sFuncList, WELS_CPU_SSE41, 1);
uint8_t *pRefPicCenter = m_pRefData+(m_iHeight/2)*m_iWidth+(m_iWidth/2);
sMe.iCurMeBlockPixX = (m_iWidth/2);
sMe.iCurMeBlockPixY = (m_iHeight/2);
bool bDataGeneratorSucceed = false;
bool bFoundMatch = false;
int32_t iTryTimes=100;
sTargetMv.iMvX = 0;
sTargetMv.iMvY = -sMe.iCurMeBlockPixY + INTPEL_NEEDED_MARGIN + rand()%(m_iHeight - 16 - 2*INTPEL_NEEDED_MARGIN);
bDataGeneratorSucceed = false;
bFoundMatch = false;
while (!bFoundMatch && (iTryTimes--)>0) {
if (!YUVPixelDataGenerator( m_pRefData, m_iWidth, m_iHeight, m_iWidth ))
continue;
bDataGeneratorSucceed = true;
CopyTargetBlock( m_pSrcBlock, 16, sTargetMv, m_iWidth, pRefPicCenter);
//clean the sMe status
sMe.uiBlockSize = rand()%5;
sMe.pEncMb = m_pSrcBlock;
sMe.pRefMb = pRefPicCenter;
sMe.pColoRefMb = pRefPicCenter;
sMe.sMv.iMvX = sMe.sMv.iMvY = 0;
sMe.uiSadCost = sMe.uiSatdCost = kiMaxBlock16Sad;
const int32_t iCurMeBlockPixX = sMe.iCurMeBlockPixX;
const int32_t iCurMeBlockQpelPixX = ((iCurMeBlockPixX)<<2);
const int32_t iCurMeBlockPixY = sMe.iCurMeBlockPixY;
const int32_t iCurMeBlockQpelPixY = ((iCurMeBlockPixY)<<2);
uint16_t* pMvdCostX = sMe.pMvdCost - iCurMeBlockQpelPixX - sMe.sMvp.iMvX; //do the offset here
uint16_t* pMvdCostY = sMe.pMvdCost - iCurMeBlockQpelPixY - sMe.sMvp.iMvY;
VerticalFullSearchUsingSSE41 ( &sFuncList, &sMe,
pMvdCostY, pMvdCostX[ iCurMeBlockQpelPixX ],
m_iMaxSearchBlock, m_iWidth,
INTPEL_NEEDED_MARGIN,
m_iHeight-INTPEL_NEEDED_MARGIN-16, true );
//the last selection may be affected by MVDcost, that is when smaller MvY will be better
bFoundMatch = (sMe.sMv.iMvX==0
&&(sMe.sMv.iMvY==sTargetMv.iMvY||abs(sMe.sMv.iMvY)<abs(sTargetMv.iMvY)));
//printf("TestVerticalSearch Target: %d,%d\n", sTargetMv.iMvX, sTargetMv.iMvY);
}
if (bDataGeneratorSucceed) {
//if DataGenerator never succeed, there is no meaning to check iTryTimes
ASSERT_TRUE(iTryTimes > 0);
//it is possible that ref at differnt position is identical, but that should be under a low probability
}
} }
TEST_F(MotionEstimateTest, TestHorizontalSearch_SSE41) TEST_F(MotionEstimateTest, TestHorizontalSearch_SSE41)
{ {
const int32_t kiMaxBlock16Sad = 72000;//a rough number
SWelsFuncPtrList sFuncList;
SWelsME sMe;
srand((uint32_t)time(NULL));
const uint8_t kuiQp = rand()%52;
InitMe(kuiQp, 648, m_uiMvdTableSize, m_pMvdCostTable, &sMe);
int32_t iTmp = 1; int32_t iTmp = 1;
uint32_t uiCPUFlags = WelsCPUFeatureDetect( &iTmp); uint32_t uiCPUFlags = WelsCPUFeatureDetect( &iTmp);
if ((uiCPUFlags & WELS_CPU_SSE41) == 0) return ; if ((uiCPUFlags & WELS_CPU_SSE41) == 0) return ;
SMVUnitXY sTargetMv;
WelsInitSampleSadFunc( &sFuncList, 0 );//test c functions
WelsInitMeFunc(&sFuncList, WELS_CPU_SSE41, 1);
uint8_t *pRefPicCenter = m_pRefData+(m_iHeight/2)*m_iWidth+(m_iWidth/2); DoLineTest(HorizontalFullSearchUsingSSE41, false);
sMe.iCurMeBlockPixX = (m_iWidth/2);
sMe.iCurMeBlockPixY = (m_iHeight/2);
bool bDataGeneratorSucceed = false;
bool bFoundMatch = false;
int32_t iTryTimes=100;
sTargetMv.iMvX = -sMe.iCurMeBlockPixX + INTPEL_NEEDED_MARGIN + rand()%(m_iWidth - 16 - 2*INTPEL_NEEDED_MARGIN);
sTargetMv.iMvY = 0;
bDataGeneratorSucceed = false;
bFoundMatch = false;
while (!bFoundMatch && (iTryTimes--)>0) {
if (!YUVPixelDataGenerator( m_pRefData, m_iWidth, m_iHeight, m_iWidth ))
continue;
bDataGeneratorSucceed = true;
CopyTargetBlock( m_pSrcBlock, m_iMaxSearchBlock, sTargetMv, m_iWidth, pRefPicCenter );
//clean sMe status
sMe.uiBlockSize = rand()%5;
sMe.pEncMb = m_pSrcBlock;
sMe.pRefMb = pRefPicCenter;
sMe.pColoRefMb = pRefPicCenter;
sMe.sMv.iMvX = sMe.sMv.iMvY = 0;
sMe.uiSadCost = sMe.uiSatdCost = kiMaxBlock16Sad;
const int32_t iCurMeBlockPixX = sMe.iCurMeBlockPixX;
const int32_t iCurMeBlockQpelPixX = ((iCurMeBlockPixX)<<2);
const int32_t iCurMeBlockPixY = sMe.iCurMeBlockPixY;
const int32_t iCurMeBlockQpelPixY = ((iCurMeBlockPixY)<<2);
uint16_t* pMvdCostX = sMe.pMvdCost - iCurMeBlockQpelPixX - sMe.sMvp.iMvX; //do the offset here
uint16_t* pMvdCostY = sMe.pMvdCost - iCurMeBlockQpelPixY - sMe.sMvp.iMvY;
HorizontalFullSearchUsingSSE41 ( &sFuncList, &sMe,
pMvdCostX, pMvdCostY[ iCurMeBlockQpelPixY ],
m_iMaxSearchBlock, m_iWidth,
INTPEL_NEEDED_MARGIN,
m_iWidth-INTPEL_NEEDED_MARGIN-16, false );
//the last selection may be affected by MVDcost, that is when smaller MvY will be better
bFoundMatch = (sMe.sMv.iMvY==0
&&(sMe.sMv.iMvX==sTargetMv.iMvX||abs(sMe.sMv.iMvX)<abs(sTargetMv.iMvX)));
//printf("TestHorizontalSearch Target: %d,%d\n", sTargetMv.iMvX, sTargetMv.iMvY);
}
if (bDataGeneratorSucceed) {
//if DataGenerator never succeed, there is no meaning to check iTryTimes
ASSERT_TRUE(iTryTimes > 0);
//it is possible that ref at differnt position is identical, but that should be under a low probability
}
} }
#endif #endif