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

Scaler: Recycle allocations using buffer pool.

Browse Source 
BUG=1128
R=stefan@webrtc.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49489004

Cr-Commit-Position: refs/heads/master@{#8828}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8828 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
magjed@webrtc.org 2015-03-23 12:27:55 +00:00
parent 09b6ff9460
commit d4e7d49628
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/common_video/i420_video_frame.cc
View File

@ -226,4 +226,9 @@ rtc::scoped_refptr<VideoFrameBuffer> I420VideoFrame::video_frame_buffer()
return video_frame_buffer_; return video_frame_buffer_;
} }
void I420VideoFrame::set_video_frame_buffer(
const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer) {
video_frame_buffer_ = buffer;
}
} // namespace webrtc } // namespace webrtc

5
webrtc/common_video/libyuv/include/scaler.h
View File

@ -15,6 +15,7 @@
#ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_ #ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_
#define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_ #define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_
#include "webrtc/common_video/interface/i420_buffer_pool.h"
#include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
@ -43,8 +44,7 @@ class Scaler {
ScaleMethod method); ScaleMethod method);
// Scale frame // Scale frame
// Memory is allocated by user. If dst_frame is not of sufficient size, // Memory is allocated by this object and recycled using |buffer_pool_|.
// the frame will be reallocated to the appropriate size.
// Return value: 0 - OK, // Return value: 0 - OK,
// -1 - parameter error // -1 - parameter error
// -2 - scaler not set // -2 - scaler not set
@ -62,6 +62,7 @@ class Scaler {
int dst_width_; int dst_width_;
int dst_height_; int dst_height_;
bool set_; bool set_;
I420BufferPool buffer_pool_;
}; };
} // namespace webrtc } // namespace webrtc

6
webrtc/common_video/libyuv/scaler.cc
View File

@ -56,10 +56,8 @@ int Scaler::Scale(const I420VideoFrame& src_frame,
return -2; return -2;
// Making sure that destination frame is of sufficient size. // Making sure that destination frame is of sufficient size.
// Aligning stride values based on width. dst_frame->set_video_frame_buffer(
dst_frame->CreateEmptyFrame(dst_width_, dst_height_, buffer_pool_.CreateBuffer(dst_width_, dst_height_));
dst_width_, (dst_width_ + 1) / 2,
(dst_width_ + 1) / 2);
// We want to preserve aspect ratio instead of stretching the frame. // We want to preserve aspect ratio instead of stretching the frame.
// Therefore, we need to crop the source frame. Calculate the largest center // Therefore, we need to crop the source frame. Calculate the largest center

5
webrtc/video_frame.h
View File

@ -162,6 +162,10 @@ class I420VideoFrame {
// Return the underlying buffer. // Return the underlying buffer.
rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const; rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const;
// Set the underlying buffer.
void set_video_frame_buffer(
const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer);
private: private:
// An opaque reference counted handle that stores the pixel data. // An opaque reference counted handle that stores the pixel data.
rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_; rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
@ -202,4 +206,3 @@ class EncodedImage {
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_VIDEO_FRAME_H_ #endif // WEBRTC_VIDEO_FRAME_H_