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

Properly limit the range for the random target motion vectors

Browse Source 
A 16x16 pixel block is copied to the destination pointed out by the
target motion vector. Since the motion vector is relative to the
center of the buffer, the upper bound of the range is size/2-16.

Previously we never used negative motion vectors, but there is no
reason not to test that direction. Therefore, the possible range
would be [-size/2,size/2-16]. Additionally pad this range with
INTPEL_NEEDED_MARGIN.
This commit is contained in:
Martin Storsjö 2014-05-04 17:40:28 +03:00
parent 03db750ba9
commit b1c13f4954
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/encoder/EncUT_MotionEstimate.cpp
View File

@ -147,7 +147,7 @@ TEST_F(MotionEstimateTest, TestVerticalSearch) {
int32_t iTryTimes=100;
sTargetMv.iMvX = 0;
sTargetMv.iMvY = WELS_MAX(INTPEL_NEEDED_MARGIN, rand()%m_iHeight-INTPEL_NEEDED_MARGIN);
sTargetMv.iMvY = -sMe.iCurMeBlockPixY + INTPEL_NEEDED_MARGIN + rand()%(m_iHeight - 16 - 2*INTPEL_NEEDED_MARGIN);
bDataGeneratorSucceed = false;
bFoundMatch = false;
while (!bFoundMatch && (iTryTimes--)>0) {
@ -207,7 +207,7 @@ TEST_F(MotionEstimateTest, TestHorizontalSearch) {
bool bFoundMatch = false;
int32_t iTryTimes=100;
sTargetMv.iMvX = WELS_MAX(INTPEL_NEEDED_MARGIN, rand()%m_iWidth-INTPEL_NEEDED_MARGIN);
sTargetMv.iMvX = -sMe.iCurMeBlockPixX + INTPEL_NEEDED_MARGIN + rand()%(m_iWidth - 16 - 2*INTPEL_NEEDED_MARGIN);
sTargetMv.iMvY = 0;
bDataGeneratorSucceed = false;
bFoundMatch = false;
@ -276,7 +276,7 @@ TEST_F(MotionEstimateTest, TestVerticalSearch_SSE41)
int32_t iTryTimes=100;
sTargetMv.iMvX = 0;
sTargetMv.iMvY = WELS_MAX(INTPEL_NEEDED_MARGIN, rand()%m_iHeight-INTPEL_NEEDED_MARGIN);
sTargetMv.iMvY = -sMe.iCurMeBlockPixY + INTPEL_NEEDED_MARGIN + rand()%(m_iHeight - 16 - 2*INTPEL_NEEDED_MARGIN);
bDataGeneratorSucceed = false;
bFoundMatch = false;
while (!bFoundMatch && (iTryTimes--)>0) {
@ -341,7 +341,7 @@ TEST_F(MotionEstimateTest, TestHorizontalSearch_SSE41)
bool bFoundMatch = false;
int32_t iTryTimes=100;
sTargetMv.iMvX = WELS_MAX(INTPEL_NEEDED_MARGIN, rand()%m_iWidth-INTPEL_NEEDED_MARGIN);
sTargetMv.iMvX = -sMe.iCurMeBlockPixX + INTPEL_NEEDED_MARGIN + rand()%(m_iWidth - 16 - 2*INTPEL_NEEDED_MARGIN);
sTargetMv.iMvY = 0;
bDataGeneratorSucceed = false;
bFoundMatch = false;