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

webrtc/common_video/libyuv/webrtc_libyuv.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 231 matching lines @@
 
 // TODO(nisse): Delete this wrapper, let callers use libyuv directly.
 int ConvertToI420(VideoType src_video_type,
                   const uint8_t* src_frame,
                   int crop_x,
                   int crop_y,
                   int src_width,
                   int src_height,
                   size_t sample_size,
                   VideoRotation rotation,
-                  VideoFrame* dst_frame) {
-  int dst_width = dst_frame->width();
-  int dst_height = dst_frame->height();
+                  const rtc::scoped_refptr<I420Buffer>& dst_buffer) {
+  int dst_width = dst_buffer->width();
+  int dst_height = dst_buffer->height();
   // LibYuv expects pre-rotation values for dst.
   // Stride values should correspond to the destination values.
   if (rotation == kVideoRotation_90 || rotation == kVideoRotation_270) {
-    dst_width = dst_frame->height();
-    dst_height = dst_frame->width();
+    dst_width = dst_buffer->height();
+    dst_height = dst_buffer->width();
   }
   return libyuv::ConvertToI420(
       src_frame, sample_size,
-      dst_frame->video_frame_buffer()->MutableDataY(),
-      dst_frame->video_frame_buffer()->StrideY(),
-      dst_frame->video_frame_buffer()->MutableDataU(),
-      dst_frame->video_frame_buffer()->StrideU(),
-      dst_frame->video_frame_buffer()->MutableDataV(),
-      dst_frame->video_frame_buffer()->StrideV(),
+      dst_buffer->MutableDataY(), dst_buffer->StrideY(),
+      dst_buffer->MutableDataU(), dst_buffer->StrideU(),
+      dst_buffer->MutableDataV(), dst_buffer->StrideV(),
       crop_x, crop_y,
       src_width, src_height,
       dst_width, dst_height,
       ConvertRotationMode(rotation),
       ConvertVideoType(src_video_type));
 }
 
 int ConvertFromI420(const VideoFrame& src_frame,
                     VideoType dst_video_type,
                     int dst_sample_size,
                     uint8_t* dst_frame) {
   return libyuv::ConvertFromI420(
       src_frame.video_frame_buffer()->DataY(),
       src_frame.video_frame_buffer()->StrideY(),
       src_frame.video_frame_buffer()->DataU(),
       src_frame.video_frame_buffer()->StrideU(),
       src_frame.video_frame_buffer()->DataV(),
       src_frame.video_frame_buffer()->StrideV(),
       dst_frame, dst_sample_size,
       src_frame.width(), src_frame.height(),
       ConvertVideoType(dst_video_type));
 }
 
 // Compute PSNR for an I420 frame (all planes)
+double I420PSNR(const rtc::scoped_refptr<VideoFrameBuffer>& ref_buffer,
+                const rtc::scoped_refptr<VideoFrameBuffer>& test_buffer) {
+  if (!ref_buffer || !test_buffer)
+    return -1;
+  else if ((ref_buffer->width() != test_buffer->width()) ||
+           (ref_buffer->height() != test_buffer->height()))
+    return -1;
+  else if (ref_buffer->width() < 0 || ref_buffer->height() < 0)
+    return -1;
+
+  double psnr = libyuv::I420Psnr(ref_buffer->DataY(), ref_buffer->StrideY(),
+                                 ref_buffer->DataU(), ref_buffer->StrideU(),
+                                 ref_buffer->DataV(), ref_buffer->StrideV(),
+                                 test_buffer->DataY(), test_buffer->StrideY(),
+                                 test_buffer->DataU(), test_buffer->StrideU(),
+                                 test_buffer->DataV(), test_buffer->StrideV(),
+                                 test_buffer->width(), test_buffer->height());
+  // LibYuv sets the max psnr value to 128, we restrict it here.
+  // In case of 0 mse in one frame, 128 can skew the results significantly.
+  return (psnr > kPerfectPSNR) ? kPerfectPSNR : psnr;
+}
+
+// Compute PSNR for an I420 frame (all planes)
 double I420PSNR(const VideoFrame* ref_frame, const VideoFrame* test_frame) {
   if (!ref_frame || !test_frame)
     return -1;
-  else if ((ref_frame->width() !=  test_frame->width()) ||
-          (ref_frame->height() !=  test_frame->height()))
-    return -1;
-  else if (ref_frame->width() < 0 || ref_frame->height() < 0)
-    return -1;
-
-  double psnr = libyuv::I420Psnr(ref_frame->video_frame_buffer()->DataY(),
-                                 ref_frame->video_frame_buffer()->StrideY(),
-                                 ref_frame->video_frame_buffer()->DataU(),
-                                 ref_frame->video_frame_buffer()->StrideU(),
-                                 ref_frame->video_frame_buffer()->DataV(),
-                                 ref_frame->video_frame_buffer()->StrideV(),
-                                 test_frame->video_frame_buffer()->DataY(),
-                                 test_frame->video_frame_buffer()->StrideY(),
-                                 test_frame->video_frame_buffer()->DataU(),
-                                 test_frame->video_frame_buffer()->StrideU(),
-                                 test_frame->video_frame_buffer()->DataV(),
-                                 test_frame->video_frame_buffer()->StrideV(),
-                                 test_frame->width(), test_frame->height());
-  // LibYuv sets the max psnr value to 128, we restrict it here.
-  // In case of 0 mse in one frame, 128 can skew the results significantly.
-  return (psnr > kPerfectPSNR) ? kPerfectPSNR : psnr;
+  return I420PSNR(ref_frame->video_frame_buffer(),
+                  test_frame->video_frame_buffer());
 }
 
 // Compute SSIM for an I420 frame (all planes)
+double I420SSIM(const rtc::scoped_refptr<VideoFrameBuffer>& ref_buffer,
+                const rtc::scoped_refptr<VideoFrameBuffer>& test_buffer) {
+  if (!ref_buffer || !test_buffer)
+    return -1;
+  else if ((ref_buffer->width() != test_buffer->width()) ||
+          (ref_buffer->height() != test_buffer->height()))
+    return -1;
+  else if (ref_buffer->width() < 0 || ref_buffer->height() < 0)
+    return -1;
+
+  return libyuv::I420Ssim(ref_buffer->DataY(), ref_buffer->StrideY(),
+                          ref_buffer->DataU(), ref_buffer->StrideU(),
+                          ref_buffer->DataV(), ref_buffer->StrideV(),
+                          test_buffer->DataY(), test_buffer->StrideY(),
+                          test_buffer->DataU(), test_buffer->StrideU(),
+                          test_buffer->DataV(), test_buffer->StrideV(),
+                          test_buffer->width(), test_buffer->height());
+}
 double I420SSIM(const VideoFrame* ref_frame, const VideoFrame* test_frame) {
   if (!ref_frame || !test_frame)
     return -1;
-  else if ((ref_frame->width() !=  test_frame->width()) ||
-          (ref_frame->height() !=  test_frame->height()))
-    return -1;
-  else if (ref_frame->width() < 0 || ref_frame->height()  < 0)
-    return -1;
-
-  return libyuv::I420Ssim(ref_frame->video_frame_buffer()->DataY(),
-                          ref_frame->video_frame_buffer()->StrideY(),
-                          ref_frame->video_frame_buffer()->DataU(),
-                          ref_frame->video_frame_buffer()->StrideU(),
-                          ref_frame->video_frame_buffer()->DataV(),
-                          ref_frame->video_frame_buffer()->StrideV(),
-                          test_frame->video_frame_buffer()->DataY(),
-                          test_frame->video_frame_buffer()->StrideY(),
-                          test_frame->video_frame_buffer()->DataU(),
-                          test_frame->video_frame_buffer()->StrideU(),
-                          test_frame->video_frame_buffer()->DataV(),
-                          test_frame->video_frame_buffer()->StrideV(),
-                          test_frame->width(), test_frame->height());
+  return I420SSIM(ref_frame->video_frame_buffer(),
+                  test_frame->video_frame_buffer());
 }
 }  // namespace webrtc