Make VEA test support videos with different coded size and visible size

media/base/video_frame.cc

 // Copyright (c) 2012 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 <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 727 matching lines @@
 bool VideoFrame::IsValidPlane(size_t plane, VideoFrame::Format format) {
   return (plane < NumPlanes(format));
 }
 
 int VideoFrame::stride(size_t plane) const {
   DCHECK(IsValidPlane(plane, format_));
   return strides_[plane];
 }
 
 // static
-int VideoFrame::RowBytes(size_t plane, VideoFrame::Format format, int width) {
+size_t VideoFrame::RowBytes(size_t plane, VideoFrame::Format format,
+                            int width) {
   DCHECK(IsValidPlane(plane, format));
   switch (format) {
     case VideoFrame::YV24:
       switch (plane) {
         case kYPlane:
         case kUPlane:
         case kVPlane:
           return width;
         default:
           break;
@@ skipping 43 matching lines @@
   }
   NOTREACHED() << "Unsupported video frame format/plane: " << format << "/"
                << plane;
   return 0;
 }
 
 int VideoFrame::row_bytes(size_t plane) const {
   return RowBytes(plane, format_, coded_size_.width());
 }
 
-int VideoFrame::rows(size_t plane) const {
-  DCHECK(IsValidPlane(plane, format_));
-  int height = coded_size_.height();
-  switch (format_) {
+// static
+size_t VideoFrame::Rows(size_t plane, VideoFrame::Format format, int height) {
+  DCHECK(IsValidPlane(plane, format));
+  switch (format) {
     case VideoFrame::YV24:
     case VideoFrame::YV16:
       switch (plane) {
         case kYPlane:
         case kUPlane:
         case kVPlane:
           return height;
         default:
           break;
       }
@@ skipping 33 matching lines @@
           break;
       }
       break;
     case VideoFrame::UNKNOWN:
 #if defined(VIDEO_HOLE)
     case VideoFrame::HOLE:
 #endif  // defined(VIDEO_HOLE)
     case VideoFrame::NATIVE_TEXTURE:
       break;
   }
-  NOTREACHED() << "Unsupported video frame format/plane: "
-               << format_ << "/" << plane;
+  NOTREACHED() << "Unsupported video frame format/plane: " << format << "/"
+               << plane;
   return 0;
 }
 
+int VideoFrame::rows(size_t plane) const {
+  return Rows(plane, format_, coded_size_.height());
+}
+
 uint8* VideoFrame::data(size_t plane) const {
   DCHECK(IsValidPlane(plane, format_));
   return data_[plane];
 }
 
 const gpu::MailboxHolder* VideoFrame::mailbox_holder() const {
   DCHECK_EQ(format_, NATIVE_TEXTURE);
   return mailbox_holder_.get();
 }
 
@@ skipping 30 matching lines @@
       break;
     for (int row = 0; row < rows(plane); ++row) {
       base::MD5Update(context, base::StringPiece(
           reinterpret_cast<char*>(data(plane) + stride(plane) * row),
           row_bytes(plane)));
     }
   }
 }
 
 }  // namespace media