EVEA cleanup: use video utility functions in media::*

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 106 matching lines @@
     read_pixels_cb_.Run(pixels);
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::WrapExternalSharedMemory(
     Format format,
     const gfx::Size& coded_size,
     const gfx::Rect& visible_rect,
     const gfx::Size& natural_size,
     uint8* data,
+    size_t data_size,
     base::SharedMemoryHandle handle,
     base::TimeDelta timestamp,
     const base::Closure& no_longer_needed_cb) {
+  if (data_size < AllocationSize(format, coded_size))

[Cris Neckar, 2013/08/23 22:25:44]

Allocation size will overflow for large values which could allow this check to
pass

[sheu, 2013/08/26 21:07:07]

I did the check at a higher level now.  Do we need to check explicitly here?

[Ami GONE FROM CHROMIUM, 2013/08/26 22:00:23]

Are you referring to IsValidConfig()?  Because that's only DCHECK'd, no?

[sheu, 2013/08/27 22:05:56]

I'm doing the DCHECKS when values for this are being passed in over IPC.  I
think that should be sufficient.

[Ami GONE FROM CHROMIUM, 2013/08/27 23:57:08]

I think the point is that the danger from malicious renderers will ignore
DCHECKs in the release build.

[sheu, 2013/08/28 00:03:59]

Whoops, I meant to say that it's being checked at the IPC layer explicitly and
error-ed out at that API layer if it's out of bounds.

So it's being checked in release too.

+    return NULL;
+
   switch (format) {
     case I420: {
       scoped_refptr<VideoFrame> frame(new VideoFrame(
           format, coded_size, visible_rect, natural_size, timestamp));
       frame->shared_memory_handle_ = handle;
       frame->strides_[kYPlane] = coded_size.width();
       frame->strides_[kUPlane] = coded_size.width() / 2;
       frame->strides_[kVPlane] = coded_size.width() / 2;
       frame->data_[kYPlane] = data;
       frame->data_[kUPlane] = data + coded_size.GetArea();
@@ skipping 83 matching lines @@
 size_t VideoFrame::NumPlanes(Format format) {
   switch (format) {
     case VideoFrame::NATIVE_TEXTURE:
 #if defined(GOOGLE_TV)
     case VideoFrame::HOLE:
 #endif
       return 0;
     case VideoFrame::RGB32:
       return 1;
     case VideoFrame::YV12:
+    case VideoFrame::I420:

[Ami GONE FROM CHROMIUM, 2013/08/26 22:00:23]

Why this reorder, which puts separates two similar values (YV12/YV16), but more
importantly puts it out of order of enum declaration?

[sheu, 2013/08/27 22:05:56]

I did this to match the order in AllocationSize() below.  I'll revert.

     case VideoFrame::YV16:
-    case VideoFrame::I420:
       return 3;
     case VideoFrame::YV12A:
       return 4;
     case VideoFrame::EMPTY:
     case VideoFrame::INVALID:
       break;
   }
   NOTREACHED() << "Unsupported video frame format: " << format;
   return 0;
 }
 
+// static
+size_t VideoFrame::AllocationSize(Format format, const gfx::Size& coded_size) {
+  switch (format) {
+    case VideoFrame::RGB32:
+      return coded_size.GetArea() * 4;
+    case VideoFrame::YV12:
+    case VideoFrame::I420:
+      return coded_size.GetArea() * 3 / 2;
+    case VideoFrame::YV12A:
+      return coded_size.GetArea() * 5 / 2;

[Ami GONE FROM CHROMIUM, 2013/08/26 22:00:23]

For this and l.257 above, is it necessary to check that height & width are even?
 Otherwise shouldn't these be ceil's?

[sheu, 2013/08/27 22:05:56]

Done.

+    case VideoFrame::YV16:
+      return coded_size.GetArea() * 2;
+    case VideoFrame::INVALID:
+    case VideoFrame::EMPTY:
+    case VideoFrame::NATIVE_TEXTURE:
+#if defined(GOOGLE_TV)
+    case VideoFrame::HOLE:
+#endif
+      break;
+  }
+  NOTREACHED() << "Unsupported video frame format: " << format;
+  return 0;
+}
+
 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)));
   return ((value + (alignment - 1)) & ~(alignment-1));
 }
 
 // Release data allocated by AllocateRGB() or AllocateYUV().
 static void ReleaseData(uint8* data) {
   DCHECK(data);
   base::AlignedFree(data);
@@ skipping 196 matching lines @@
     : mailbox_(mailbox),
       sync_point_(sync_point),
       release_callback_(release_callback) {}
 
 VideoFrame::MailboxHolder::~MailboxHolder() {
   if (!release_callback_.is_null())
     release_callback_.Run(sync_point_);
 }
 
 }  // namespace media