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

common_video: Removing compiler warnings

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/93009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@273 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@google.com 2011-07-29 20:23:01 +00:00
parent e89f6b5574
commit 7acd3ba9e9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common_video/jpeg/main/source/jpeg.cc
View File

@ -98,8 +98,8 @@ JpegEncoder::Encode(const RawImage& inputImage)
FILE* outFile = NULL;
const WebRtc_Word32 width = inputImage._width;
const WebRtc_Word32 height = inputImage._height;
const WebRtc_UWord32 width = inputImage._width;
const WebRtc_UWord32 height = inputImage._height;
// Set error handler
myErrorMgr jerr;
@ -276,7 +276,7 @@ JpegDecoder::Decode(const EncodedImage& inputImage,
WebRtc_UWord32 height16 = (height + 15) & ~15;
WebRtc_UWord32 stride = (width + 15) & ~15;
WebRtc_UWord32 uvStride = (((stride + 1 >> 1) + 15) & ~15);
WebRtc_UWord32 uvStride = ((((stride + 1) >> 1) + 15) & ~15);
WebRtc_UWord32 tmpRequiredSize = stride * height16 +
2 * (uvStride * ((height16 + 1) >> 1));

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

@ -169,7 +169,7 @@ ScaleBilinear(const WebRtc_UWord8* srcFrame, WebRtc_UWord8*& dstFrame,
WebRtc_UWord8* srcTmp = NULL;
const WebRtc_UWord32 srcStride = (srcWidth + 15) & ~15;
const WebRtc_UWord32 srcUvStride = (((srcStride + 1 >> 1) + 15) & ~15);
const WebRtc_UWord32 srcUvStride = ((((srcStride + 1) >> 1) + 15) & ~15);
const WebRtc_UWord32 srcStrideArray[3] = {srcStride,
srcUvStride,
@ -192,7 +192,6 @@ ScaleBilinear(const WebRtc_UWord8* srcFrame, WebRtc_UWord8*& dstFrame,
tmpPlaneArray[2] = tmpPlaneArray[1] +
(srcStride >> 1) * (srcHeight >> 1);
WebRtc_UWord8* tmpPtr = srcTmp;
const WebRtc_UWord8* srcPtr = srcFrame;
for (WebRtc_UWord32 p = 0; p < 3; p++)