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

video_processing: Removing compiler Warnings

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

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

2
src/modules/video_processing/main/source/content_analysis.cc
View File

@ -19,7 +19,6 @@ namespace webrtc {
VPMContentAnalysis::VPMContentAnalysis():
_origFrame(NULL),
_prevFrame(NULL),
_firstFrame(true),
_width(0),
_height(0),
_motionMagnitudeNZ(0.0f),
@ -30,6 +29,7 @@ _sizeZeroMotion(0.0f),
_motionPredErr(0.0f),
_motionHorizontalness(0.0f),
_motionClusterDistortion(0.0f),
_firstFrame(true),
_CAInit(false),
_cMetrics(NULL)
{

10
src/modules/video_processing/main/source/spatial_resampler.cc
View File

@ -101,7 +101,6 @@ VPMSimpleSpatialResampler::ResampleFrame(const VideoFrame& inFrame,
outFrame.SetTimeStamp(inFrame.TimeStamp());
WebRtc_UWord32 currentLength = inFrame.Width() * inFrame.Height() * 3 / 2;
if (_targetWidth > inFrame.Width() &&
( ExactMultiplier(inFrame.Width(), inFrame.Height())))
{
@ -155,7 +154,6 @@ VPMSimpleSpatialResampler::UpsampleFrame(const VideoFrame& inFrame,
WebRtc_UWord32 scaledWidth = 0;
WebRtc_UWord32 scaledHeight = 0;
bool scaled = true;
if(ratioWidth > 1 || ratioHeight > 1)
{
@ -290,10 +288,10 @@ VPMSimpleSpatialResampler::ExactMultiplier(WebRtc_UWord32 width,
// we have a multiple, is it an even multiple?
WebRtc_Word32 widthMultiple = _targetWidth / width;
WebRtc_Word32 heightMultiple = _targetHeight / height;
if (widthMultiple == 2 && heightMultiple == 2 ||
widthMultiple == 4 && heightMultiple == 4 ||
widthMultiple == 8 && heightMultiple == 8 ||
widthMultiple == 1 && heightMultiple == 1)
if ((widthMultiple == 2 && heightMultiple == 2) ||
(widthMultiple == 4 && heightMultiple == 4) ||
(widthMultiple == 8 && heightMultiple == 8) ||
(widthMultiple == 1 && heightMultiple == 1))
{
exactMultiplier = true;
}