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

Fix unused variable warning in spatial_resampler.cc

Browse Source 
Issue 60: [Patch] Fix unused variable warning in spatial_resampler.cc
Review URL: http://webrtc-codereview.appspot.com/125003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@444 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2011-08-25 07:53:53 +00:00
parent 1cdc6b5d79
commit 44d356d6df
1 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,6 @@ VPMSimpleSpatialResampler::UpsampleFrame(const VideoFrame& inFrame,
VideoFrame& outFrame) VideoFrame& outFrame)
{ {
outFrame.CopyFrame(inFrame); outFrame.CopyFrame(inFrame);
WebRtc_UWord32 currentLength = inFrame.Width() * inFrame.Height() * 3 / 2;
float ratioWidth = _targetWidth / (float)inFrame.Width(); float ratioWidth = _targetWidth / (float)inFrame.Width();
float ratioHeight = _targetHeight / (float)inFrame.Height(); float ratioHeight = _targetHeight / (float)inFrame.Height();
@@ -161,46 +160,62 @@ VPMSimpleSpatialResampler::UpsampleFrame(const VideoFrame& inFrame,
if(ratioWidth <= 1.5 && ratioHeight <= 1.5) if(ratioWidth <= 1.5 && ratioHeight <= 1.5)
{ {
// scale up 1.5 // scale up 1.5
currentLength = ScaleI420Up3_2(inFrame.Width(), inFrame.Height(), WebRtc_Word32 ret = ScaleI420Up3_2(inFrame.Width(), inFrame.Height(),
outFrame.Buffer(), outFrame.Size(), outFrame.Buffer(), outFrame.Size(),
scaledWidth, scaledHeight); scaledWidth, scaledHeight);
if (ret < 0)
return VPM_GENERAL_ERROR;
} }
else if(ratioWidth <= 2 && ratioHeight <= 2) else if(ratioWidth <= 2 && ratioHeight <= 2)
{ {
// scale up 2 // scale up 2
currentLength = ScaleI420Up2(inFrame.Width(), inFrame.Height(), WebRtc_Word32 ret = ScaleI420Up2(inFrame.Width(), inFrame.Height(),
outFrame.Buffer(), outFrame.Size(), outFrame.Buffer(), outFrame.Size(),
scaledWidth, scaledHeight); scaledWidth, scaledHeight);
if (ret < 0)
return VPM_GENERAL_ERROR;
} }
else if(ratioWidth <= 2.25 && ratioHeight <= 2.25) else if(ratioWidth <= 2.25 && ratioHeight <= 2.25)
{ {
// scale up 2.25 // scale up 2.25
currentLength = ScaleI420Up3_2(inFrame.Width(), inFrame.Height(), WebRtc_Word32 ret = ScaleI420Up3_2(inFrame.Width(), inFrame.Height(),
outFrame.Buffer(), outFrame.Size(), outFrame.Buffer(), outFrame.Size(),
scaledWidth, scaledHeight); scaledWidth, scaledHeight);
currentLength = ScaleI420Up3_2(scaledWidth, scaledHeight, if (ret < 0)
outFrame.Buffer(), outFrame.Size(), return VPM_GENERAL_ERROR;
scaledWidth, scaledHeight); ret = ScaleI420Up3_2(scaledWidth, scaledHeight,
outFrame.Buffer(), outFrame.Size(),
scaledWidth, scaledHeight);
if (ret < 0)
return VPM_GENERAL_ERROR;
} }
else if(ratioWidth <= 3 && ratioHeight <= 3) else if(ratioWidth <= 3 && ratioHeight <= 3)
{ {
// scale up 3 // scale up 3
currentLength = ScaleI420Up2(inFrame.Width(), inFrame.Height(), WebRtc_Word32 ret = ScaleI420Up2(inFrame.Width(), inFrame.Height(),
outFrame.Buffer(), outFrame.Size(), outFrame.Buffer(), outFrame.Size(),
scaledWidth, scaledHeight); scaledWidth, scaledHeight);
currentLength = ScaleI420Up3_2(scaledWidth, scaledHeight, if (ret < 0)
outFrame.Buffer(), outFrame.Size(), return VPM_GENERAL_ERROR;
scaledWidth, scaledHeight); ret = ScaleI420Up3_2(scaledWidth, scaledHeight,
outFrame.Buffer(), outFrame.Size(),
scaledWidth, scaledHeight);
if (ret < 0)
return VPM_GENERAL_ERROR;
} }
else if(ratioWidth <= 4 && ratioHeight <= 4) else if(ratioWidth <= 4 && ratioHeight <= 4)
{ {
// scale up 4 // scale up 4
currentLength = ScaleI420Up2(inFrame.Width(), inFrame.Height(), WebRtc_Word32 ret = ScaleI420Up2(inFrame.Width(), inFrame.Height(),
outFrame.Buffer(), outFrame.Size(), outFrame.Buffer(), outFrame.Size(),
scaledWidth, scaledHeight); scaledWidth, scaledHeight);
currentLength = ScaleI420Up2(scaledWidth, scaledHeight, if (ret < 0)
outFrame.Buffer(), outFrame.Size(), return VPM_GENERAL_ERROR;
scaledWidth, scaledHeight); ret = ScaleI420Up2(scaledWidth, scaledHeight,
outFrame.Buffer(), outFrame.Size(),
scaledWidth, scaledHeight);
if (ret < 0)
return VPM_GENERAL_ERROR;
} }
//TODO: what if ratioWidth/Height >= 8 ? //TODO: what if ratioWidth/Height >= 8 ?
@@ -213,9 +228,11 @@ VPMSimpleSpatialResampler::UpsampleFrame(const VideoFrame& inFrame,
if ((static_cast<WebRtc_UWord32>(scaledWidth) > _targetWidth) || if ((static_cast<WebRtc_UWord32>(scaledWidth) > _targetWidth) ||
(static_cast<WebRtc_UWord32>(scaledHeight) > _targetHeight)) (static_cast<WebRtc_UWord32>(scaledHeight) > _targetHeight))
{ {
currentLength = CutI420Frame(outFrame.Buffer(), scaledWidth, WebRtc_Word32 ret = CutI420Frame(outFrame.Buffer(),
scaledHeight, _targetWidth, scaledWidth, scaledHeight,
_targetHeight); _targetWidth, _targetHeight);
if (ret < 0)
return VPM_GENERAL_ERROR;
} }
} }
else else