Allow wrapping a media::VideoFrame with a new view_rect.

media/base/video_frame_pool_unittest.cc

 // Copyright 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 "media/base/video_frame_pool.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 
 class VideoFramePoolTest : public ::testing::Test {
  public:
   VideoFramePoolTest() : pool_(new VideoFramePool()) {}
 
+

[tommi (sloooow) - chröme, 2014/03/05 16:17:37]

nit: one empty line should be enough

[perkj_chrome, 2014/03/05 16:39:49]

Done.

   scoped_refptr<VideoFrame> CreateFrame(VideoFrame::Format format,
                                         int timestamp_ms) {
     gfx::Size coded_size(320,240);
     gfx::Rect visible_rect(coded_size);
+
+    return CreateFrame(format, coded_size, visible_rect, timestamp_ms);
+  }
+
+  scoped_refptr<VideoFrame> CreateFrame(VideoFrame::Format format,
+                                        const gfx::Size& coded_size,
+                                        const gfx::Rect& visible_rect,
+                                        int timestamp_ms) {
     gfx::Size natural_size(coded_size);
-
     scoped_refptr<VideoFrame> frame =
         pool_->CreateFrame(
             format, coded_size, visible_rect, natural_size,
             base::TimeDelta::FromMilliseconds(timestamp_ms));
     EXPECT_EQ(format, frame->format());
     EXPECT_EQ(base::TimeDelta::FromMilliseconds(timestamp_ms),
               frame->GetTimestamp());
     EXPECT_EQ(coded_size, frame->coded_size());
     EXPECT_EQ(visible_rect, frame->visible_rect());
     EXPECT_EQ(natural_size, frame->natural_size());
@@ skipping 14 matching lines @@
   const uint8* old_y_data = frame->data(VideoFrame::kYPlane);
 
   // Clear frame reference to return the frame to the pool.
   frame = NULL;
 
   // Verify that the next frame from the pool uses the same memory.
   scoped_refptr<VideoFrame> new_frame = CreateFrame(VideoFrame::YV12, 20);
   EXPECT_EQ(old_y_data, new_frame->data(VideoFrame::kYPlane));
 }
 
+TEST_F(VideoFramePoolTest, FrameReuseWithDifferentVisibleRect) {
+  scoped_refptr<VideoFrame> frame = CreateFrame(VideoFrame::YV12, 10);
+  const uint8* old_y_data = frame->data(VideoFrame::kYPlane);
+  const gfx::Size coded_size = frame->coded_size();
+
+  // Clear frame reference to return the frame to the pool.
+  frame = NULL;
+
+  // Verify that the next frame from the pool uses the same memory even if the
+  // visible rect has changed.
+  gfx::Rect visible_rect(5, 5, coded_size.width() - 10,
+                         coded_size.height() - 10);
+  scoped_refptr<VideoFrame> new_frame = CreateFrame(
+      VideoFrame::YV12, coded_size, visible_rect, 20);
+  EXPECT_EQ(old_y_data, new_frame->data(VideoFrame::kYPlane));

[Ami GONE FROM CHROMIUM, 2014/03/05 16:23:42]

EXPECT_EQ(new_frame->visible_rect(), visible_rect);
?

[perkj_chrome, 2014/03/05 16:39:49]

That is done in CreateFrame for all calls to CreateFrame.

+}
+
 TEST_F(VideoFramePoolTest, SimpleFormatChange) {
   scoped_refptr<VideoFrame> frame_a = CreateFrame(VideoFrame::YV12, 10);
   scoped_refptr<VideoFrame> frame_b = CreateFrame(VideoFrame::YV12, 10);
 
   // Clear frame references to return the frames to the pool.
   frame_a = NULL;
   frame_b = NULL;
 
   // Verify that both frames are in the pool.
   CheckPoolSize(2u);
@@ skipping 10 matching lines @@
   // Destroy the pool.
   pool_.reset();
 
   // Write to the Y plane. The memory tools should detect a
   // use-after-free if the storage was actually removed by pool destruction.
   memset(frame->data(VideoFrame::kYPlane), 0xff,
          frame->rows(VideoFrame::kYPlane) * frame->stride(VideoFrame::kYPlane));
 }
 
 }  // namespace media