zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor scaling.

Browse Source 
Introduce a new method I420Buffer::CropAndScale, and a static
convenience helper I420Buffer::CenterCropAndScale. Use them for almost
all scaling needs.

Delete the Scaler class and the cricket::VideoFrame::Stretch* methods.

BUG=webrtc:5682
R=pbos@webrtc.org, perkj@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/2020593002 .

Cr-Commit-Position: refs/heads/master@{#13110}
This commit is contained in:
Niels Möller
2016-06-13 13:06:01 +02:00
parent be99ab9356
commit 718a763d59
33 changed files with 396 additions and 1030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/modules/video_processing/spatial_resampler.cc
View File

@ -13,10 +13,7 @@
namespace webrtc {
VPMSimpleSpatialResampler::VPMSimpleSpatialResampler()
: resampling_mode_(kFastRescaling),
target_width_(0),
target_height_(0),
scaler_() {}
: resampling_mode_(kFastRescaling), target_width_(0), target_height_(0) {}
VPMSimpleSpatialResampler::~VPMSimpleSpatialResampler() {}
@ -56,26 +53,17 @@ int32_t VPMSimpleSpatialResampler::ResampleFrame(const VideoFrame& inFrame,
return VPM_OK;
}
// Setting scaler
// TODO(mikhal/marpan): Should we allow for setting the filter mode in
// _scale.Set() with |resampling_mode_|?
int ret_val = 0;
ret_val = scaler_.Set(inFrame.width(), inFrame.height(), target_width_,
target_height_, kI420, kI420, kScaleBox);
if (ret_val < 0)
return ret_val;
rtc::scoped_refptr<I420Buffer> scaled_buffer(
buffer_pool_.CreateBuffer(target_width_, target_height_));
ret_val = scaler_.Scale(inFrame, outFrame);
scaled_buffer->CropAndScaleFrom(inFrame.video_frame_buffer());
outFrame->set_video_frame_buffer(scaled_buffer);
// Setting time parameters to the output frame.
// Timestamp will be reset in Scale call above, so we should set it after.
outFrame->set_timestamp(inFrame.timestamp());
outFrame->set_render_time_ms(inFrame.render_time_ms());
if (ret_val == 0)
return VPM_OK;
else
return VPM_SCALE_ERROR;
return VPM_OK;
}
int32_t VPMSimpleSpatialResampler::TargetHeight() {