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

Limit the ME scanning range to 16 pixels from the end of the buffer

Browse Source 
The block size is chosen randomly; if the block size is 16,
LineFullSearch_c will read a block with 16 pixels from kiMaxPos;
thus kiMaxPos cannot be larger than height-16, otherwise the calls
end up with reads out of bounds.
This commit is contained in:
Martin Storsjö
2014-05-04 17:35:01 +03:00
parent e4a9c7f8e4
commit 03db750ba9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/encoder/EncUT_MotionEstimate.cpp
View File

@@ -174,7 +174,7 @@ TEST_F(MotionEstimateTest, TestVerticalSearch) {
pMvdCostY, pMvdCostX[ iCurMeBlockQpelPixX ], pMvdCostY, pMvdCostX[ iCurMeBlockQpelPixX ],
m_iMaxSearchBlock, m_iWidth, m_iMaxSearchBlock, m_iWidth,
INTPEL_NEEDED_MARGIN, INTPEL_NEEDED_MARGIN,
m_iHeight-INTPEL_NEEDED_MARGIN, true ); m_iHeight-INTPEL_NEEDED_MARGIN-16, true );
//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 bFoundMatch = (sMe.sMv.iMvX==0
@@ -235,7 +235,7 @@ TEST_F(MotionEstimateTest, TestHorizontalSearch) {
pMvdCostX, pMvdCostY[ iCurMeBlockQpelPixY ], pMvdCostX, pMvdCostY[ iCurMeBlockQpelPixY ],
m_iMaxSearchBlock, m_iWidth, m_iMaxSearchBlock, m_iWidth,
INTPEL_NEEDED_MARGIN, INTPEL_NEEDED_MARGIN,
m_iWidth-INTPEL_NEEDED_MARGIN, false ); m_iWidth-INTPEL_NEEDED_MARGIN-16, false );
//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.iMvY==0 bFoundMatch = (sMe.sMv.iMvY==0
@@ -303,7 +303,7 @@ TEST_F(MotionEstimateTest, TestVerticalSearch_SSE41)
pMvdCostY, pMvdCostX[ iCurMeBlockQpelPixX ], pMvdCostY, pMvdCostX[ iCurMeBlockQpelPixX ],
m_iMaxSearchBlock, m_iWidth, m_iMaxSearchBlock, m_iWidth,
INTPEL_NEEDED_MARGIN, INTPEL_NEEDED_MARGIN,
m_iHeight-INTPEL_NEEDED_MARGIN, true ); m_iHeight-INTPEL_NEEDED_MARGIN-16, true );
//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 bFoundMatch = (sMe.sMv.iMvX==0
@@ -369,7 +369,7 @@ TEST_F(MotionEstimateTest, TestHorizontalSearch_SSE41)
pMvdCostX, pMvdCostY[ iCurMeBlockQpelPixY ], pMvdCostX, pMvdCostY[ iCurMeBlockQpelPixY ],
m_iMaxSearchBlock, m_iWidth, m_iMaxSearchBlock, m_iWidth,
INTPEL_NEEDED_MARGIN, INTPEL_NEEDED_MARGIN,
m_iWidth-INTPEL_NEEDED_MARGIN, false ); m_iWidth-INTPEL_NEEDED_MARGIN-16, false );
//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.iMvY==0 bFoundMatch = (sMe.sMv.iMvY==0