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

Fix writing outside of allocated space on bilinear frame scale.

Browse Source 
Was incorrectly extending filtered frame area by duplicating
the last pixel.  This was necessary when this was used with
color convert, but isn't needed for this application.

Added comments to help clarify some buffer usage.
Review URL: http://webrtc-codereview.appspot.com/84001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@244 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
frkoenig@google.com
2011-07-22 17:24:11 +00:00
parent 72610e22f8
commit e9a53a236b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common_video/vplib/main/source/scale_bilinear_yuv.cc
View File

@@ -277,6 +277,8 @@ ScaleBilinear(const WebRtc_UWord8* srcFrame, WebRtc_UWord8*& dstFrame,
{
horizontalFilteredBuf = filteredBuf;
// If vertical filtering must be done then put the results
// from the horizontal filtering in an intermediary buffer
if (source_dx != kFractionMax)
{
horizontalFilteredBuf = intermediaryBuf;
@@ -290,14 +292,13 @@ ScaleBilinear(const WebRtc_UWord8* srcFrame, WebRtc_UWord8*& dstFrame,
source_h_subpixel += kFractionMax / 2;
}
// Choose the two lines that are going to be bilinear filtered.
WebRtc_UWord32 source_h = source_h_subpixel >> kFractionBits;
const WebRtc_UWord8* ptr_0 = srcPlaneArray[p] +
source_h * srcStrideArray[p];
const WebRtc_UWord8* ptr_1 = ptr_0 + srcStrideArray[p];
// vertical scaler uses 16.8 fixed point
// scaler uses 16.8 fixed point
WebRtc_UWord32 source_h_fraction =
(source_h_subpixel & kFractionMask) >> 8;
@@ -311,7 +312,6 @@ ScaleBilinear(const WebRtc_UWord8* srcFrame, WebRtc_UWord8*& dstFrame,
{
memcpy(horizontalFilteredBuf, ptr_1, srcWidthArray[p]);
}
filteredBuf[(srcWidthArray[p]-1)] = filteredBuf[(srcWidthArray[p]-2)];
// vertical filter only if necessary
if (source_dx != kFractionMax)