Delete webrtc::VideoFrame::CreateEmptyFrame.

webrtc/test/frame_generator.cc

 /*
  *  Copyright (c) 2013 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.
  */
 #include "webrtc/test/frame_generator.h"
@@ skipping 128 matching lines @@
                                size_t source_height,
                                size_t target_width,
                                size_t target_height,
                                int64_t scroll_time_ms,
                                int64_t pause_time_ms)
       : clock_(clock),
         start_time_(clock->TimeInMilliseconds()),
         scroll_time_(scroll_time_ms),
         pause_time_(pause_time_ms),
         num_frames_(files.size()),
+        target_width_(static_cast<int>(target_width)),
+        target_height_(static_cast<int>(target_height)),
         current_frame_num_(num_frames_ - 1),
         current_source_frame_(nullptr),
         file_generator_(files, source_width, source_height, 1) {
     RTC_DCHECK(clock_ != nullptr);
     RTC_DCHECK_GT(num_frames_, 0u);
     RTC_DCHECK_GE(source_height, target_height);
     RTC_DCHECK_GE(source_width, target_width);
     RTC_DCHECK_GE(scroll_time_ms, 0);
     RTC_DCHECK_GE(pause_time_ms, 0);
     RTC_DCHECK_GT(scroll_time_ms + pause_time_ms, 0);
-    current_frame_.CreateEmptyFrame(static_cast<int>(target_width),
-                                    static_cast<int>(target_height),
-                                    static_cast<int>(target_width),
-                                    static_cast<int>((target_width + 1) / 2),
-                                    static_cast<int>((target_width + 1) / 2));
   }
 
   virtual ~ScrollingImageFrameGenerator() {}
 
   VideoFrame* NextFrame() override {
     const int64_t kFrameDisplayTime = scroll_time_ + pause_time_;
     const int64_t now = clock_->TimeInMilliseconds();
     int64_t ms_since_start = now - start_time_;
 
     size_t frame_num = (ms_since_start / kFrameDisplayTime) % num_frames_;
@@ skipping 13 matching lines @@
 
   void UpdateSourceFrame(size_t frame_num) {
     while (current_frame_num_ != frame_num) {
       current_source_frame_ = file_generator_.NextFrame();
       current_frame_num_ = (current_frame_num_ + 1) % num_frames_;
     }
     RTC_DCHECK(current_source_frame_ != nullptr);
   }
 
   void CropSourceToScrolledImage(double scroll_factor) {
-    const int kTargetWidth = current_frame_.width();
-    const int kTargetHeight = current_frame_.height();
-    int scroll_margin_x = current_source_frame_->width() - kTargetWidth;
+    int scroll_margin_x = current_source_frame_->width() - target_width_;
     int pixels_scrolled_x =
         static_cast<int>(scroll_margin_x * scroll_factor + 0.5);
-    int scroll_margin_y = current_source_frame_->height() - kTargetHeight;
+    int scroll_margin_y = current_source_frame_->height() - target_height_;
     int pixels_scrolled_y =
         static_cast<int>(scroll_margin_y * scroll_factor + 0.5);
 
     int offset_y = (current_source_frame_->video_frame_buffer()->StrideY() *
                     pixels_scrolled_y) +
                    pixels_scrolled_x;
     int offset_u = (current_source_frame_->video_frame_buffer()->StrideU() *
                     (pixels_scrolled_y / 2)) +
                    (pixels_scrolled_x / 2);
     int offset_v = (current_source_frame_->video_frame_buffer()->StrideV() *
                     (pixels_scrolled_y / 2)) +
                    (pixels_scrolled_x / 2);
 
     current_frame_.CreateFrame(
         &current_source_frame_->video_frame_buffer()->DataY()[offset_y],
         &current_source_frame_->video_frame_buffer()->DataU()[offset_u],
         &current_source_frame_->video_frame_buffer()->DataV()[offset_v],
-        kTargetWidth, kTargetHeight,
+        target_width_, target_height_,
         current_source_frame_->video_frame_buffer()->StrideY(),
         current_source_frame_->video_frame_buffer()->StrideU(),
         current_source_frame_->video_frame_buffer()->StrideV(),
         kVideoRotation_0);
   }
 
   Clock* const clock_;
   const int64_t start_time_;
   const int64_t scroll_time_;
   const int64_t pause_time_;
   const size_t num_frames_;
+  const int target_width_;
+  const int target_height_;
+
   size_t current_frame_num_;
   VideoFrame* current_source_frame_;
   VideoFrame current_frame_;
   YuvFileGenerator file_generator_;
 };
 
 }  // namespace
 
 FrameForwarder::FrameForwarder() : sink_(nullptr) {}
 
@@ skipping 54 matching lines @@
     files.push_back(file);
   }
 
   return new ScrollingImageFrameGenerator(
       clock, files, source_width, source_height, target_width, target_height,
       scroll_time_ms, pause_time_ms);
 }
 
 }  // namespace test
 }  // namespace webrtc