Fix support for yuv_422 pixel format.

media/base/video_frame.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/video_frame.h"
 
 #include "base/logging.h"
 
 namespace media {
 
@@ skipping 57 matching lines @@
   // Fill the Y plane.
   uint8* y_plane = frame->data(VideoFrame::kYPlane);
   for (size_t i = 0; i < frame->height_; ++i) {
     memset(y_plane, kBlackY, frame->width_);
     y_plane += frame->stride(VideoFrame::kYPlane);
   }
 
   // Fill the U and V planes.
   uint8* u_plane = frame->data(VideoFrame::kUPlane);
   uint8* v_plane = frame->data(VideoFrame::kVPlane);
-  for (size_t i = 0; i < (frame->height_ / 2); ++i) {
-    memset(u_plane, kBlackUV, frame->width_ / 2);
-    memset(v_plane, kBlackUV, frame->width_ / 2);
+  int uv_rows = frame->rows(VideoFrame::kUPlane);
+  int u_row_bytes = frame->row_bytes(VideoFrame::kUPlane);
+  int v_row_bytes = frame->row_bytes(VideoFrame::kVPlane);
+  for (size_t i = 0; i < (size_t)uv_rows; ++i) {
+    memset(u_plane, kBlackUV, u_row_bytes);
+    memset(v_plane, kBlackUV, v_row_bytes);
     u_plane += frame->stride(VideoFrame::kUPlane);
     v_plane += frame->stride(VideoFrame::kVPlane);
   }
 
   return frame;
 }
 
 static inline size_t RoundUp(size_t value, size_t alignment) {
   // Check that |alignment| is a power of 2.
   DCHECK((alignment + (alignment - 1)) == (alignment | (alignment - 1)));
@@ skipping 17 matching lines @@
   DCHECK(format_ == VideoFrame::YV12 || format_ == VideoFrame::YV16);
   // Align Y rows at 32-bit (4 byte) boundaries.  The stride for both YV12 and
   // YV16 is 1/2 of the stride of Y.  For YV12, every row of bytes for U and V
   // applies to two rows of Y (one byte of UV for 4 bytes of Y), so in the
   // case of YV12 the strides are identical for the same width surface, but the
   // number of bytes allocated for YV12 is 1/2 the amount for U & V as YV16.
   // We also round the height of the surface allocated to be an even number
   // 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 alloc_height = RoundUp(height_, 2);
-  size_t y_bytes_per_row = RoundUp(width_, 4);
-  size_t uv_stride = RoundUp(y_bytes_per_row / 2, 4);
-  size_t y_bytes = alloc_height * y_bytes_per_row;
-  size_t uv_bytes = alloc_height * uv_stride;
-  if (format_ == VideoFrame::YV12) {
-    uv_bytes /= 2;
-  }
+  size_t y_height = RoundUp(rows(VideoFrame::kYPlane), 2);
+  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 y_bytes = y_height * y_stride;
+  size_t uv_bytes = uv_height * uv_stride;
+
   uint8* data = new uint8[y_bytes + (uv_bytes * 2) + kFramePadBytes];
   planes_ = VideoFrame::kNumYUVPlanes;
   COMPILE_ASSERT(0 == VideoFrame::kYPlane, y_plane_data_must_be_index_0);
   data_[VideoFrame::kYPlane] = data;
   data_[VideoFrame::kUPlane] = data + y_bytes;
   data_[VideoFrame::kVPlane] = data + y_bytes + uv_bytes;
-  strides_[VideoFrame::kYPlane] = y_bytes_per_row;

[fbarchard, 2011/10/05 01:38:46]

FYI I'd suggest using 'stride' terminology consistently, which we still do for
uv_stride.  stride indicates that it is how much we advance after each row,
which can be negative, and/or allows cropping.

+  strides_[VideoFrame::kYPlane] = y_stride;
   strides_[VideoFrame::kUPlane] = uv_stride;
   strides_[VideoFrame::kVPlane] = uv_stride;
 }
 
 VideoFrame::VideoFrame(VideoFrame::Format format,
                        size_t width,
                        size_t height)
     : format_(format),
       width_(width),
       height_(height),
@@ skipping 89 matching lines @@
 uint8* VideoFrame::data(size_t plane) const {
   DCHECK(IsValidPlane(plane));
   return data_[plane];
 }
 
 bool VideoFrame::IsEndOfStream() const {
   return format_ == VideoFrame::EMPTY;
 }
 
 }  // namespace media