diff options
author | sheu@chromium.org <sheu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-31 21:20:15 +0000 |
---|---|---|
committer | sheu@chromium.org <sheu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-31 21:20:15 +0000 |
commit | 6baaf307201ec03343f16404710886c1457906d5 (patch) | |
tree | a3caf36054a3c833f6dd986eef6d1f48db5b0865 /common_video/i420_video_frame.cc | |
parent | 7773eec26b014503bebc29cdf4c216b89ac02380 (diff) | |
download | webrtc-6baaf307201ec03343f16404710886c1457906d5.tar.gz |
Revert "Remove extra copy in VideoCaptureImpl::IncomingFrameI420"
This reverts commit 99f9743fe39066ba93b41f2b0a417696cbbd06fb.
Revert while build breakage is fixed.
BUG=None
TBR=niklas.emblom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/3249004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5069 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'common_video/i420_video_frame.cc')
-rw-r--r-- | common_video/i420_video_frame.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/common_video/i420_video_frame.cc b/common_video/i420_video_frame.cc index 332a1e81..e369ffe1 100644 --- a/common_video/i420_video_frame.cc +++ b/common_video/i420_video_frame.cc @@ -58,23 +58,6 @@ int I420VideoFrame::CreateFrame(int size_y, const uint8_t* buffer_y, return 0; } -int I420VideoFrame::AliasBuffers(int size_y, uint8_t* buffer_y, - int size_u, uint8_t* buffer_u, - int size_v, uint8_t* buffer_v, - int width, int height, - int stride_y, int stride_u, int stride_v) { - if (size_y < 1 || size_u < 1 || size_v < 1) - return -1; - if (CheckDimensions(width, height, stride_y, stride_u, stride_v) < 0) - return -1; - y_plane_.Alias(size_y, stride_y, buffer_y); - u_plane_.Alias(size_u, stride_u, buffer_u); - v_plane_.Alias(size_v, stride_v, buffer_v); - width_ = width; - height_ = height; - return 0; -} - int I420VideoFrame::CopyFrame(const I420VideoFrame& videoFrame) { int ret = CreateFrame(videoFrame.allocated_size(kYPlane), videoFrame.buffer(kYPlane), |