Remove dead code paths around PIXEL_STORAGE_TEXTURE in capture pipeline.

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 <climits>
 
 #include "base/bind.h"
@@ skipping 812 matching lines @@
     const gfx::Size& coded_size,
     const gfx::Rect& visible_rect,
     const gfx::Size& natural_size,
     uint8* data,
     size_t data_size,
     base::TimeDelta timestamp,
     base::SharedMemoryHandle handle,
     size_t data_offset) {
   DCHECK(IsStorageTypeMappable(storage_type));
 
+  // TODO(miu): This function should support any frame format.

[mcasas, 2015/11/13 19:13:57]

nit: bug for this? (It should be accompanied by unittest etc).

[miu, 2015/11/14 03:43:48]

Done.

   if (format != PIXEL_FORMAT_I420) {
     DLOG(ERROR) << "Only PIXEL_FORMAT_I420 format supported: "
                 << VideoPixelFormatToString(format);
     return nullptr;
   }
 
   if (!IsValidConfig(format, storage_type, coded_size, visible_rect,
                      natural_size)) {
     DLOG(ERROR) << __FUNCTION__ << " Invalid config."
                 << ConfigToString(format, storage_type, coded_size,
                                   visible_rect, natural_size);
     return nullptr;
   }
 
   scoped_refptr<VideoFrame> frame;
   if (storage_type == STORAGE_SHMEM) {
     frame = new VideoFrame(format, storage_type, coded_size, visible_rect,
                            natural_size, timestamp, handle, data_offset);
   } else {
     frame = new VideoFrame(format, storage_type, coded_size, visible_rect,
                            natural_size, timestamp);
   }
   frame->strides_[kYPlane] = coded_size.width();
+  // TODO(miu): This always rounds widths down, whereas VideoFrame::RowBytes()
+  // always rounds up.  This inconsistency must be resolved.  Perhaps a
+  // CommonAlignment() check should be made in IsValidConfig()?
   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();
   frame->data_[kVPlane] = data + (coded_size.GetArea() * 5 / 4);
   return frame;
 }
 
 VideoFrame::VideoFrame(VideoPixelFormat format,
                        StorageType storage_type,
@@ skipping 137 matching lines @@
   if (zero_initialize_memory)
     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));
 }
 
 }  // namespace media