Refactor scaling.

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 112 matching lines @@
     return -1;
   }
   if (PrintPlane(frame.video_frame_buffer()->DataV(),
                  chroma_width, chroma_height,
                  frame.video_frame_buffer()->StrideV(), file) < 0) {
     return -1;
   }
   return 0;
 }
 
-int ExtractBuffer(const VideoFrame& input_frame, size_t size, uint8_t* buffer) {
+int ExtractBuffer(const rtc::scoped_refptr<VideoFrameBuffer>& input_frame,
+                  size_t size,
+                  uint8_t* buffer) {
   assert(buffer);
-  if (input_frame.IsZeroSize())
+  if (!input_frame)
     return -1;
-  size_t length =
-      CalcBufferSize(kI420, input_frame.width(), input_frame.height());
+  int width = input_frame->width();
+  int height = input_frame->height();
+  size_t length = CalcBufferSize(kI420, width, height);
   if (size < length) {
      return -1;
   }
 
-  int width = input_frame.video_frame_buffer()->width();
-  int height = input_frame.video_frame_buffer()->height();
   int chroma_width = (width + 1) / 2;
   int chroma_height = (height + 1) / 2;
 
-  libyuv::I420Copy(input_frame.video_frame_buffer()->DataY(),
-                   input_frame.video_frame_buffer()->StrideY(),
-                   input_frame.video_frame_buffer()->DataU(),
-                   input_frame.video_frame_buffer()->StrideU(),
-                   input_frame.video_frame_buffer()->DataV(),
-                   input_frame.video_frame_buffer()->StrideV(),
+  libyuv::I420Copy(input_frame->DataY(),
+                   input_frame->StrideY(),
+                   input_frame->DataU(),
+                   input_frame->StrideU(),
+                   input_frame->DataV(),
+                   input_frame->StrideV(),
                    buffer, width,
                    buffer + width*height, chroma_width,
                    buffer + width*height + chroma_width*chroma_height,
                    chroma_width,
                    width, height);
 
   return static_cast<int>(length);
 }
 
+int ExtractBuffer(const VideoFrame& input_frame, size_t size, uint8_t* buffer) {
+  return ExtractBuffer(input_frame.video_frame_buffer(), size, buffer);
+}
 
 int ConvertNV12ToRGB565(const uint8_t* src_frame,
                         uint8_t* dst_frame,
                         int width, int height) {
   int abs_height = (height < 0) ? -height : height;
   const uint8_t* yplane = src_frame;
   const uint8_t* uvInterlaced = src_frame + (width * abs_height);
 
   return libyuv::NV12ToRGB565(yplane, width,
                               uvInterlaced, (width + 1) >> 1,
@@ skipping 158 matching lines @@
                           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());
 }
 }  // namespace webrtc