From 598cc6a4da6202980cc5634e3ae73ddfa0842ba9 Mon Sep 17 00:00:00 2001 From: "cevans@chromium.org" Date: Thu, 10 Nov 2011 19:40:21 +0000 Subject: Correct some rounding errors introduced recently. BUG=101494 Review URL: http://codereview.chromium.org/8511043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109480 0039d316-1c4b-4281-b951-d872f2087c98 --- media/base/video_frame.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index 340ba19..a0dc579 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -118,10 +118,10 @@ void VideoFrame::AllocateYUV() { // to avoid any potential of faulting by code that attempts to access the Y // values of the final row, but assumes that the last row of U & V applies to // a full two rows of Y. - size_t y_height = RoundUp(rows(VideoFrame::kYPlane), 2); + size_t y_height = rows(VideoFrame::kYPlane); size_t y_stride = RoundUp(row_bytes(VideoFrame::kYPlane), 4); size_t uv_stride = RoundUp(row_bytes(VideoFrame::kUPlane), 4); - size_t uv_height = RoundUp(rows(VideoFrame::kUPlane), 2); + size_t uv_height = rows(VideoFrame::kUPlane); size_t y_bytes = y_height * y_stride; size_t uv_bytes = uv_height * uv_stride; @@ -195,7 +195,7 @@ int VideoFrame::row_bytes(size_t plane) const { case YV16: if (plane == kYPlane) return width_; - return width_ / 2; + return RoundUp(width_, 2) / 2; default: break; @@ -220,7 +220,7 @@ int VideoFrame::rows(size_t plane) const { case YV12: if (plane == kYPlane) return height_; - return height_ / 2; + return RoundUp(height_, 2) / 2; default: break; -- cgit v1.1