commit dbc9d5c5f1d064b66172883cd60a5546b1a1dbf8
author mikhal@google.com <mikhal@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jul 29 20:23:29 2011 +0000
committer mikhal@google.com <mikhal@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jul 29 20:23:29 2011 +0000
tree b33dda2bb996384848548beb00e4023bb73767ee
parent 506bc3cf12f28cc19f9260075a852f0e780d9ac6

video_processing: Removing compiler Warnings
Review URL: http://webrtc-codereview.appspot.com/91009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@275 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/video_processing/main/source/content_analysis.cc

diff --git a/src/modules/video_processing/main/source/content_analysis.cc b/src/modules/video_processing/main/source/content_analysis.cc
index 8e8e840..4cf4acd 100644
--- a/src/modules/video_processing/main/source/content_analysis.cc
+++ b/src/modules/video_processing/main/source/content_analysis.cc
@@ -19,7 +19,6 @@
 VPMContentAnalysis::VPMContentAnalysis():
 _origFrame(NULL),
 _prevFrame(NULL),
-_firstFrame(true),
 _width(0),
 _height(0),
 _motionMagnitudeNZ(0.0f),
@@ -30,6 +29,7 @@
 _motionPredErr(0.0f),
 _motionHorizontalness(0.0f),
 _motionClusterDistortion(0.0f),
+_firstFrame(true),
 _CAInit(false),
 _cMetrics(NULL)
 {

src/modules/video_processing/main/source/spatial_resampler.cc

diff --git a/src/modules/video_processing/main/source/spatial_resampler.cc b/src/modules/video_processing/main/source/spatial_resampler.cc
index 0014ef2..711236c 100644
--- a/src/modules/video_processing/main/source/spatial_resampler.cc
+++ b/src/modules/video_processing/main/source/spatial_resampler.cc
@@ -101,7 +101,6 @@
 
     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 @@
 
     WebRtc_UWord32 scaledWidth = 0;
     WebRtc_UWord32 scaledHeight = 0;
-    bool scaled = true;
 
     if(ratioWidth > 1 || ratioHeight > 1)
     {
@@ -290,10 +288,10 @@
         // 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;
         }