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

Switching to I420VideoFrame

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/922004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2983 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org
2012-10-24 18:33:04 +00:00
parent 6392657643
commit 9fedff7c17
152 changed files with 2076 additions and 1862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/modules/utility/source/frame_scaler.cc
View File

@ -23,26 +23,26 @@ FrameScaler::FrameScaler()
FrameScaler::~FrameScaler() {}
int FrameScaler::ResizeFrameIfNeeded(VideoFrame* video_frame,
WebRtc_UWord32 out_width,
WebRtc_UWord32 out_height) {
if (video_frame->Length() == 0) {
int FrameScaler::ResizeFrameIfNeeded(I420VideoFrame* video_frame,
int out_width,
int out_height) {
if (video_frame->IsZeroSize()) {
return -1;
}
if ((video_frame->Width() != out_width) ||
(video_frame->Height() != out_height)) {
if ((video_frame->width() != out_width) ||
(video_frame->height() != out_height)) {
// Set correct scale settings and scale |video_frame| into |scaled_frame_|.
scaler_->Set(video_frame->Width(), video_frame->Height(), out_width,
scaler_->Set(video_frame->width(), video_frame->height(), out_width,
out_height, kI420, kI420, kScaleBox);
int ret = scaler_->Scale(*video_frame, &scaled_frame_);
if (ret < 0) {
return ret;
}
scaled_frame_.SetRenderTime(video_frame->RenderTimeMs());
scaled_frame_.SetTimeStamp(video_frame->TimeStamp());
video_frame->SwapFrame(scaled_frame_);
scaled_frame_.set_render_time_ms(video_frame->render_time_ms());
scaled_frame_.set_timestamp(video_frame->timestamp());
video_frame->SwapFrame(&scaled_frame_);
}
return 0;
}