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

content/browser/renderer_host/media/video_capture_buffer_pool.cc

 // Copyright (c) 2013 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 "content/browser/renderer_host/media/video_capture_buffer_pool.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "media/base/video_frame.h"
@@ skipping 110 matching lines @@
       DCHECK(buffer->held_by_producer);
       return buffer_id;
     }
   }
   return -1;  // Buffer is not from our pool.
 }
 
 scoped_refptr<media::VideoFrame> VideoCaptureBufferPool::ReserveI420VideoFrame(
     const gfx::Size& size,
     int rotation) {
-  if (static_cast<size_t>(size.GetArea() * 3 / 2) != GetMemorySize())
+  if (GetMemorySize() !=
+      media::VideoFrame::AllocationSize(media::VideoFrame::I420, size)) {

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

Is this a programming error and thus worthy of a DCHECK before the return NULL?

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

Not an error during midstream resolution changes.

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

VCBP doesn't support midstream resolution changes (ncarter@ is working on that,
but it's a huge project).  Can you actually make a DCHECK here trigger?
(because if you can, then we have bigger fish to fry, and if you can't, IWBN to
avoid giving the impression that this class can handle more than it in fact can)

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

Done.

     return NULL;
+  }
 
   base::AutoLock lock(lock_);
 
   int buffer_id = ReserveForProducerInternal();
   if (buffer_id < 0)
     return NULL;
 
   base::Closure disposal_handler = base::Bind(
       &VideoCaptureBufferPool::RelinquishProducerReservation,
       this,
       buffer_id);
 
   Buffer* buffer = buffers_[buffer_id];
   // Wrap the buffer in a VideoFrame container.
   scoped_refptr<media::VideoFrame> frame =
       media::VideoFrame::WrapExternalSharedMemory(
           media::VideoFrame::I420,
           size,
           gfx::Rect(size),
           size,
           static_cast<uint8*>(buffer->shared_memory.memory()),
+          GetMemorySize(),
           buffer->shared_memory.handle(),
           base::TimeDelta(),
           disposal_handler);
 
   if (buffer->rotation != rotation) {
     // TODO(nick): Generalize the |rotation| mechanism.
     media::FillYUV(frame.get(), 0, 128, 128);
     buffer->rotation = rotation;
   }
 
@@ skipping 36 matching lines @@
   return buffer_id;
 }
 
 bool VideoCaptureBufferPool::IsAllocated() const {
   lock_.AssertAcquired();
   return !buffers_.empty();
 }
 
 }  // namespace content