Remove memset from VideoFrame and mark buffer as unpoisoned

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 530 matching lines @@
 
 // static
 size_t VideoFrame::AllocationSize(Format format, const gfx::Size& coded_size) {
   size_t total = 0;
   for (size_t i = 0; i < NumPlanes(format); ++i)
     total += PlaneSize(format, i, coded_size).GetArea();
   return total;
 }
 
 // static
+size_t VideoFrame::AlignedAllocationSize(
+    const scoped_refptr<VideoFrame>& frame) {
+  DCHECK(IsYuvPlanar(frame->format()));
+  DCHECK_EQ(frame->storage_type(), STORAGE_OWNED_MEMORY);
+
+  // This method is expected to called only after CreateFrame(). Therefore, the
+  // buffer size needs to the same as the allocated size of AllocateYUV().
+  size_t data_size = 0;
+  for (size_t plane = 0; plane < NumPlanes(frame->format()); ++plane) {
+    const size_t height = RoundUp(frame->rows(plane), kFrameSizeAlignment * 2);
+    data_size += height * frame->stride(plane);
+  }
+  data_size += frame->stride(kUPlane) + kFrameSizePadding;
+  return data_size;
+}
+
+// static
 gfx::Size VideoFrame::PlaneSize(Format format,
                                 size_t plane,
                                 const gfx::Size& coded_size) {
   DCHECK(IsValidPlane(plane, format));
 
   int width = coded_size.width();
   int height = coded_size.height();
   if (format != ARGB) {
     // Align to multiple-of-two size overall. This ensures that non-subsampled
     // planes can be addressed by pixel with the same scaling as the subsampled
@@ skipping 332 matching lines @@
     data_size += height * strides_[plane];
   }
 
   // The extra line of UV being allocated is because h264 chroma MC
   // overreads by one line in some cases, see libavcodec/utils.c:
   // avcodec_align_dimensions2() and libavcodec/x86/h264_chromamc.asm:
   // put_h264_chroma_mc4_ssse3().
   DCHECK(IsValidPlane(kUPlane, format_));
   data_size += strides_[kUPlane] + kFrameSizePadding;
 
-  // FFmpeg expects the initialize allocation to be zero-initialized.  Failure
-  // to do so can lead to unitialized value usage.  See http://crbug.com/390941
   uint8* data = reinterpret_cast<uint8*>(
       base::AlignedAlloc(data_size, kFrameAddressAlignment));
-  memset(data, 0, data_size);
-
   for (size_t plane = 0; plane < NumPlanes(format_); ++plane)
     data_[plane] = data + offset[plane];
 
   AddDestructionObserver(base::Bind(&base::AlignedFree, data));
+
+  // Make sure that AlignedAllocationSize() returns the same size as allocated
+  // here.
+  DCHECK_EQ(data_size, VideoFrame::AlignedAllocationSize(this));
 }
 
 }  // namespace media