Move MutableDataY{,U,V} methods to I420Buffer only.

webrtc/common_video/libyuv/libyuv_unittest.cc

 /*
  *  Copyright (c) 2012 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 77 matching lines @@
 TEST_F(TestLibYuv, ConvertTest) {
   // Reading YUV frame - testing on the first frame of the foreman sequence
   int j = 0;
   std::string output_file_name = webrtc::test::OutputPath() +
                                  "LibYuvTest_conversion.yuv";
   FILE*  output_file = fopen(output_file_name.c_str(), "wb");
   ASSERT_TRUE(output_file != NULL);
 
   double psnr = 0.0;
 
-  VideoFrame res_i420_frame;
-  res_i420_frame.CreateEmptyFrame(width_, height_, width_,
-                                               (width_ + 1) / 2,
-                                               (width_ + 1) / 2);
-  printf("\nConvert #%d I420 <-> I420 \n", j);
-  std::unique_ptr<uint8_t[]> out_i420_buffer(new uint8_t[frame_length_]);
-  EXPECT_EQ(0, ConvertFromI420(orig_frame_, kI420, 0,
-                               out_i420_buffer.get()));
-  EXPECT_EQ(0, ConvertToI420(kI420, out_i420_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0, &res_i420_frame));
+  rtc::scoped_refptr<I420Buffer> res_i420_buffer = I420Buffer::Create(
+      width_, height_, width_, (width_ + 1) / 2, (width_ + 1) / 2);
+  {
+    printf("\nConvert #%d I420 <-> I420 \n", j);
+    std::unique_ptr<uint8_t[]> out_i420_buffer(new uint8_t[frame_length_]);
+    EXPECT_EQ(0, ConvertFromI420(orig_frame_, kI420, 0, out_i420_buffer.get()));
+    EXPECT_EQ(0, ConvertToI420(kI420, out_i420_buffer.get(), 0, 0, width_,
+                               height_, 0, kVideoRotation_0, res_i420_buffer));
 
-  if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
-    return;
+    VideoFrame res_i420_frame(res_i420_buffer, 0, 0, webrtc::kVideoRotation_0);
+    if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
+      return;
+    }
+    psnr = I420PSNR(&orig_frame_, &res_i420_frame);

[magjed_webrtc, 2016/08/25 11:12:56]

Can you use VideoFrameBuffers as input here instead?

[nisse-webrtc, 2016/08/25 11:31:35]

I think the problem is the PrintVideoFrame method. If I fix it to accept a
VideoFrameBuffer, as you suggest in a different comment, then I can use
VideoFrameBuffer for everything here, delete the res_i420frame variables, and
the braces.

I can give it a try.

+    EXPECT_EQ(48.0, psnr);
+    j++;
   }
-  psnr = I420PSNR(&orig_frame_, &res_i420_frame);
-  EXPECT_EQ(48.0, psnr);
-  j++;
+  {

[magjed_webrtc, 2016/08/25 11:12:56]

The diff is kind of broken and becomes unnecessarily large because of these new
'{'. Can remove them again so it's easier to review?

+    printf("\nConvert #%d I420 <-> RGB24\n", j);
+    std::unique_ptr<uint8_t[]> res_rgb_buffer2(
+        new uint8_t[width_ * height_ * 3]);
+    // Align the stride values for the output frame.
+    int stride_y = 0;
+    int stride_uv = 0;
+    Calc16ByteAlignedStride(width_, &stride_y, &stride_uv);
+    res_i420_buffer =
+        I420Buffer::Create(width_, height_, stride_y, stride_uv, stride_uv);
+    EXPECT_EQ(0,
+              ConvertFromI420(orig_frame_, kRGB24, 0, res_rgb_buffer2.get()));
 
-  printf("\nConvert #%d I420 <-> RGB24\n", j);
-  std::unique_ptr<uint8_t[]> res_rgb_buffer2(new uint8_t[width_ * height_ * 3]);
-  // Align the stride values for the output frame.
-  int stride_y = 0;
-  int stride_uv = 0;
-  Calc16ByteAlignedStride(width_, &stride_y, &stride_uv);
-  res_i420_frame.CreateEmptyFrame(width_, height_, stride_y,
-                                  stride_uv, stride_uv);
-  EXPECT_EQ(0, ConvertFromI420(orig_frame_, kRGB24, 0, res_rgb_buffer2.get()));
+    EXPECT_EQ(0, ConvertToI420(kRGB24, res_rgb_buffer2.get(), 0, 0, width_,
+                               height_, 0, kVideoRotation_0, res_i420_buffer));
 
-  EXPECT_EQ(0, ConvertToI420(kRGB24, res_rgb_buffer2.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0, &res_i420_frame));
+    VideoFrame res_i420_frame(res_i420_buffer, 0, 0, webrtc::kVideoRotation_0);
+    if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
+      return;
+    }
+    psnr = I420PSNR(&orig_frame_, &res_i420_frame);
 
-  if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
-    return;
+    // Optimization Speed- quality trade-off => 45 dB only (platform dependant).
+    EXPECT_GT(ceil(psnr), 44);
+    j++;
   }
-  psnr = I420PSNR(&orig_frame_, &res_i420_frame);
+  {
+    printf("\nConvert #%d I420 <-> UYVY\n", j);
+    std::unique_ptr<uint8_t[]> out_uyvy_buffer(
+        new uint8_t[width_ * height_ * 2]);
+    EXPECT_EQ(0, ConvertFromI420(orig_frame_, kUYVY, 0, out_uyvy_buffer.get()));
+    EXPECT_EQ(0, ConvertToI420(kUYVY, out_uyvy_buffer.get(), 0, 0, width_,
+                               height_, 0, kVideoRotation_0, res_i420_buffer));
+    VideoFrame res_i420_frame(res_i420_buffer, 0, 0, webrtc::kVideoRotation_0);
+    psnr = I420PSNR(&orig_frame_, &res_i420_frame);
+    EXPECT_EQ(48.0, psnr);
+    if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
+      return;
+    }
+    j++;
+  }
+  {
+    printf("\nConvert #%d I420 <-> YUY2\n", j);
+    std::unique_ptr<uint8_t[]> out_yuy2_buffer(
+        new uint8_t[width_ * height_ * 2]);
+    EXPECT_EQ(0, ConvertFromI420(orig_frame_, kYUY2, 0, out_yuy2_buffer.get()));
 
-  // Optimization Speed- quality trade-off => 45 dB only (platform dependant).
-  EXPECT_GT(ceil(psnr), 44);
-  j++;
+    EXPECT_EQ(0, ConvertToI420(kYUY2, out_yuy2_buffer.get(), 0, 0, width_,
+                               height_, 0, kVideoRotation_0, res_i420_buffer));
 
-  printf("\nConvert #%d I420 <-> UYVY\n", j);
-  std::unique_ptr<uint8_t[]> out_uyvy_buffer(new uint8_t[width_ * height_ * 2]);
-  EXPECT_EQ(0, ConvertFromI420(orig_frame_,  kUYVY, 0, out_uyvy_buffer.get()));
-  EXPECT_EQ(0, ConvertToI420(kUYVY, out_uyvy_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0, &res_i420_frame));
-  psnr = I420PSNR(&orig_frame_, &res_i420_frame);
-  EXPECT_EQ(48.0, psnr);
-  if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
-    return;
+    VideoFrame res_i420_frame(res_i420_buffer, 0, 0, webrtc::kVideoRotation_0);
+    if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
+      return;
+    }
+
+    psnr = I420PSNR(&orig_frame_, &res_i420_frame);
+    EXPECT_EQ(48.0, psnr);
   }
-  j++;
+  {
+    printf("\nConvert #%d I420 <-> RGB565\n", j);
+    std::unique_ptr<uint8_t[]> out_rgb565_buffer(
+        new uint8_t[width_ * height_ * 2]);
+    EXPECT_EQ(
+        0, ConvertFromI420(orig_frame_, kRGB565, 0, out_rgb565_buffer.get()));
 
-  printf("\nConvert #%d I420 <-> YUY2\n", j);
-  std::unique_ptr<uint8_t[]> out_yuy2_buffer(new uint8_t[width_ * height_ * 2]);
-  EXPECT_EQ(0, ConvertFromI420(orig_frame_,  kYUY2, 0, out_yuy2_buffer.get()));
+    EXPECT_EQ(0, ConvertToI420(kRGB565, out_rgb565_buffer.get(), 0, 0, width_,
+                               height_, 0, kVideoRotation_0, res_i420_buffer));
+    VideoFrame res_i420_frame(res_i420_buffer, 0, 0, webrtc::kVideoRotation_0);
+    if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
+      return;
+    }
+    j++;
 
-  EXPECT_EQ(0, ConvertToI420(kYUY2, out_yuy2_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0, &res_i420_frame));
+    psnr = I420PSNR(&orig_frame_, &res_i420_frame);
+    // TODO(leozwang) Investigate the right psnr should be set for I420ToRGB565,
+    // Another example is I420ToRGB24, the psnr is 44
+    // TODO(mikhal): Add psnr for RGB565, 1555, 4444, convert to ARGB.
+    EXPECT_GT(ceil(psnr), 40);
+  }
+  {
+    printf("\nConvert #%d I420 <-> ARGB8888\n", j);
+    std::unique_ptr<uint8_t[]> out_argb8888_buffer(
+        new uint8_t[width_ * height_ * 4]);
+    EXPECT_EQ(
+        0, ConvertFromI420(orig_frame_, kARGB, 0, out_argb8888_buffer.get()));
 
-  if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
-    return;
+    EXPECT_EQ(0, ConvertToI420(kARGB, out_argb8888_buffer.get(), 0, 0, width_,
+                               height_, 0, kVideoRotation_0, res_i420_buffer));
+
+    VideoFrame res_i420_frame(res_i420_buffer, 0, 0, webrtc::kVideoRotation_0);
+    if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
+      return;
+    }
+
+    psnr = I420PSNR(&orig_frame_, &res_i420_frame);
+    // TODO(leozwang) Investigate the right psnr should be set for
+    // I420ToARGB8888,
+    EXPECT_GT(ceil(psnr), 42);
   }
-
-  psnr = I420PSNR(&orig_frame_, &res_i420_frame);
-  EXPECT_EQ(48.0, psnr);
-  printf("\nConvert #%d I420 <-> RGB565\n", j);
-  std::unique_ptr<uint8_t[]> out_rgb565_buffer(
-      new uint8_t[width_ * height_ * 2]);
-  EXPECT_EQ(0, ConvertFromI420(orig_frame_, kRGB565, 0,
-                               out_rgb565_buffer.get()));
-
-  EXPECT_EQ(0, ConvertToI420(kRGB565, out_rgb565_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0, &res_i420_frame));
-
-  if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
-    return;
-  }
-  j++;
-
-  psnr = I420PSNR(&orig_frame_, &res_i420_frame);
-  // TODO(leozwang) Investigate the right psnr should be set for I420ToRGB565,
-  // Another example is I420ToRGB24, the psnr is 44
-  // TODO(mikhal): Add psnr for RGB565, 1555, 4444, convert to ARGB.
-  EXPECT_GT(ceil(psnr), 40);
-
-  printf("\nConvert #%d I420 <-> ARGB8888\n", j);
-  std::unique_ptr<uint8_t[]> out_argb8888_buffer(
-      new uint8_t[width_ * height_ * 4]);
-  EXPECT_EQ(0, ConvertFromI420(orig_frame_, kARGB, 0,
-                               out_argb8888_buffer.get()));
-
-  EXPECT_EQ(0, ConvertToI420(kARGB, out_argb8888_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0, &res_i420_frame));
-
-  if (PrintVideoFrame(res_i420_frame, output_file) < 0) {
-    return;
-  }
-
-  psnr = I420PSNR(&orig_frame_, &res_i420_frame);
-  // TODO(leozwang) Investigate the right psnr should be set for I420ToARGB8888,
-  EXPECT_GT(ceil(psnr), 42);
-
   ASSERT_EQ(0, fclose(output_file));
 }
 
 TEST_F(TestLibYuv, ConvertAlignedFrame) {
   // Reading YUV frame - testing on the first frame of the foreman sequence
   std::string output_file_name = webrtc::test::OutputPath() +
                                  "LibYuvTest_conversion.yuv";
   FILE*  output_file = fopen(output_file_name.c_str(), "wb");
   ASSERT_TRUE(output_file != NULL);
 
   double psnr = 0.0;
 
-  VideoFrame res_i420_frame;
   int stride_y = 0;
   int stride_uv = 0;
   Calc16ByteAlignedStride(width_, &stride_y, &stride_uv);
-  res_i420_frame.CreateEmptyFrame(width_, height_,
-                                  stride_y, stride_uv, stride_uv);
+
+  rtc::scoped_refptr<I420Buffer> res_i420_buffer =
+      I420Buffer::Create(width_, height_, stride_y, stride_uv, stride_uv);
   std::unique_ptr<uint8_t[]> out_i420_buffer(new uint8_t[frame_length_]);
   EXPECT_EQ(0, ConvertFromI420(orig_frame_, kI420, 0,
                                out_i420_buffer.get()));
   EXPECT_EQ(0, ConvertToI420(kI420, out_i420_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0, &res_i420_frame));
+                             height_, 0, kVideoRotation_0, res_i420_buffer));
 
+  VideoFrame res_i420_frame(res_i420_buffer, 0, 0, webrtc::kVideoRotation_0);
   if (PrintVideoFrame(res_i420_frame, output_file) < 0) {

[magjed_webrtc, 2016/08/25 11:12:56]

It would be nice if you can make functions like PrintVideoFrame work with
VideoFrameBuffers directly.

     return;
   }
   psnr = I420PSNR(&orig_frame_, &res_i420_frame);
   EXPECT_EQ(48.0, psnr);
 }
 
 
 TEST_F(TestLibYuv, RotateTest) {
-  // Use ConvertToI420 for multiple roatations - see that nothing breaks, all
+  // Use ConvertToI420 for multiple rotations - see that nothing breaks, all
   // memory is properly allocated and end result is equal to the starting point.
-  VideoFrame rotated_res_i420_frame;
   int rotated_width = height_;
   int rotated_height = width_;
   int stride_y;
   int stride_uv;
   Calc16ByteAlignedStride(rotated_width, &stride_y, &stride_uv);
-  rotated_res_i420_frame.CreateEmptyFrame(rotated_width,
-                                          rotated_height,
-                                          stride_y,
-                                          stride_uv,
-                                          stride_uv);
+  rtc::scoped_refptr<I420Buffer> rotated_res_i420_buffer = I420Buffer::Create(
+      rotated_width, rotated_height, stride_y, stride_uv, stride_uv);
   EXPECT_EQ(0, ConvertToI420(kI420, orig_buffer_.get(), 0, 0, width_, height_,
-                             0, kVideoRotation_90, &rotated_res_i420_frame));
+                             0, kVideoRotation_90, rotated_res_i420_buffer));
   EXPECT_EQ(0, ConvertToI420(kI420, orig_buffer_.get(), 0, 0, width_, height_,
-                             0, kVideoRotation_270, &rotated_res_i420_frame));
-  rotated_res_i420_frame.CreateEmptyFrame(width_, height_,
-                                          width_, (width_ + 1) / 2,
-                                          (width_ + 1) / 2);
+                             0, kVideoRotation_270, rotated_res_i420_buffer));
+  rotated_res_i420_buffer = I420Buffer::Create(
+      width_, height_, width_, (width_ + 1) / 2, (width_ + 1) / 2);
   EXPECT_EQ(0, ConvertToI420(kI420, orig_buffer_.get(), 0, 0, width_, height_,
-                             0, kVideoRotation_180, &rotated_res_i420_frame));
+                             0, kVideoRotation_180, rotated_res_i420_buffer));
 }
 
 }  // namespace webrtc