Revert of Initial cleanup of cricket::VideoFrame.

webrtc/media/base/videoframe_unittest.h

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 145 matching lines @@
         new rtc::MemoryStream());
     rtc::StreamResult res = Flow(fs.get(), buf, sizeof(buf), ms.get());
     if (res != rtc::SR_SUCCESS) {
       LOG(LS_ERROR) << "Could not load test file path: " << path.pathname();
       return NULL;
     }
 
     return ms.release();
   }
 
+  // Write an I420 frame out to disk.
+  bool DumpFrame(const std::string& prefix,
+                 const cricket::VideoFrame& frame) {
+    char filename[256];
+    rtc::sprintfn(filename, sizeof(filename), "%s.%dx%d_P420.yuv",
+                        prefix.c_str(), frame.GetWidth(), frame.GetHeight());
+    size_t out_size = cricket::VideoFrame::SizeOf(frame.GetWidth(),
+                                                  frame.GetHeight());
+    rtc::scoped_ptr<uint8_t[]> out(new uint8_t[out_size]);
+    frame.CopyToBuffer(out.get(), out_size);
+    return DumpSample(filename, out.get(), out_size);
+  }
+
   bool DumpSample(const std::string& filename, const void* buffer, int size) {
     rtc::Pathname path(filename);
     rtc::scoped_ptr<rtc::FileStream> fs(
         rtc::Filesystem::OpenFile(path, "wb"));
     if (!fs.get()) {
       return false;
     }
 
     return (fs->Write(buffer, size, NULL, NULL) == rtc::SR_SUCCESS);
   }
@@ skipping 1635 matching lines @@
     rtc::scoped_ptr<cricket::VideoFrame> target;
     ASSERT_TRUE(LoadFrameNoRepeat(source.get()));
     target.reset(source->Copy());
     EXPECT_TRUE(target->MakeExclusive());
     EXPECT_TRUE(IsEqual(*source, *target, 0));
     EXPECT_NE(target->GetYPlane(), source->GetYPlane());
     EXPECT_NE(target->GetUPlane(), source->GetUPlane());
     EXPECT_NE(target->GetVPlane(), source->GetVPlane());
   }
 
+  void CopyToBuffer() {
+    T frame;
+    rtc::scoped_ptr<rtc::MemoryStream> ms(
+        LoadSample(kImageFilename));
+    ASSERT_TRUE(ms.get() != NULL);
+    ASSERT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_I420, kWidth, kHeight,
+                          &frame));
+    size_t out_size = kWidth * kHeight * 3 / 2;
+    rtc::scoped_ptr<uint8_t[]> out(new uint8_t[out_size]);
+    for (int i = 0; i < repeat_; ++i) {
+      EXPECT_EQ(out_size, frame.CopyToBuffer(out.get(), out_size));
+    }
+    EXPECT_EQ(0, memcmp(out.get(), ms->GetBuffer(), out_size));
+  }
+
   void CopyToFrame() {
     T source;
     rtc::scoped_ptr<rtc::MemoryStream> ms(
         LoadSample(kImageFilename));
     ASSERT_TRUE(ms.get() != NULL);
     ASSERT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_I420, kWidth, kHeight,
                           &source));
 
     // Create the target frame by loading from a file.
     T target;
     ASSERT_TRUE(LoadFrameNoRepeat(&target));
     EXPECT_FALSE(IsBlack(target));
 
     // Stretch and check if the stretched target is black.
     source.CopyToFrame(&target);
 
     EXPECT_TRUE(IsEqual(source, target, 0));
   }
 
+  void Write() {
+    T frame;
+    rtc::scoped_ptr<rtc::MemoryStream> ms(
+        LoadSample(kImageFilename));
+    ASSERT_TRUE(ms.get() != NULL);
+    rtc::MemoryStream ms2;
+    size_t size;
+    ASSERT_TRUE(ms->GetSize(&size));
+    ASSERT_TRUE(ms2.ReserveSize(size));
+    ASSERT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_I420, kWidth, kHeight,
+                          &frame));
+    for (int i = 0; i < repeat_; ++i) {
+      ms2.SetPosition(0u);  // Useful when repeat_ > 1.
+      int error;
+      EXPECT_EQ(rtc::SR_SUCCESS, frame.Write(&ms2, &error));
+    }
+    size_t out_size = cricket::VideoFrame::SizeOf(kWidth, kHeight);
+    EXPECT_EQ(0, memcmp(ms2.GetBuffer(), ms->GetBuffer(), out_size));
+  }
+
+  void CopyToBuffer1Pixel() {
+    size_t out_size = 3;
+    rtc::scoped_ptr<uint8_t[]> out(new uint8_t[out_size + 1]);
+    memset(out.get(), 0xfb, out_size + 1);  // Fill buffer
+    uint8_t pixel[3] = {1, 2, 3};
+    T frame;
+    EXPECT_TRUE(frame.Init(cricket::FOURCC_I420, 1, 1, 1, 1, pixel,
+                           sizeof(pixel), 0,
+                           webrtc::kVideoRotation_0));
+    for (int i = 0; i < repeat_; ++i) {
+      EXPECT_EQ(out_size, frame.CopyToBuffer(out.get(), out_size));
+    }
+    EXPECT_EQ(1, out.get()[0]);  // Check Y.  Should be 1.
+    EXPECT_EQ(2, out.get()[1]);  // Check U.  Should be 2.
+    EXPECT_EQ(3, out.get()[2]);  // Check V.  Should be 3.
+    EXPECT_EQ(0xfb, out.get()[3]);  // Check sentinel is still intact.
+  }
+
   void StretchToFrame() {
     // Create the source frame as a black frame.
     T source;
     EXPECT_TRUE(source.InitToBlack(kWidth * 2, kHeight * 2, 0));
     EXPECT_TRUE(IsSize(source, kWidth * 2, kHeight * 2));
 
     // Create the target frame by loading from a file.
     T target1;
     ASSERT_TRUE(LoadFrameNoRepeat(&target1));
     EXPECT_FALSE(IsBlack(target1));
 
     // Stretch and check if the stretched target is black.
     source.StretchToFrame(&target1, true, false);
     EXPECT_TRUE(IsBlack(target1));
 
     // Crop and stretch and check if the stretched target is black.
     T target2;
     ASSERT_TRUE(LoadFrameNoRepeat(&target2));
     source.StretchToFrame(&target2, true, true);
     EXPECT_TRUE(IsBlack(target2));
     EXPECT_EQ(source.GetTimeStamp(), target2.GetTimeStamp());
   }
 
   int repeat_;
 };
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_