Move InitToBlack and Reset methods from cricket::VideoFrame to its subclass cricket::WebRtcVideoFra…

webrtc/media/engine/webrtcvideoframe.h

 /*
  *  Copyright (c) 2011 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 33 matching lines @@
             int dh,
             uint8_t* sample,
             size_t sample_size,
             int64_t time_stamp_ns,
             webrtc::VideoRotation rotation);
 
   bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation);
 
   void InitToEmptyBuffer(int w, int h, int64_t time_stamp_ns);
 
-  bool InitToBlack(int w, int h, int64_t time_stamp_ns) override;
-
-  // From base class VideoFrame.
-  bool Reset(uint32_t format,
-                     int w,
-                     int h,
-                     int dw,
-                     int dh,
-                     uint8_t* sample,
-                     size_t sample_size,
-                     int64_t time_stamp_ns,
-                     webrtc::VideoRotation rotation,
-                     bool apply_rotation) override;
+  bool InitToBlack(int w, int h, int64_t time_stamp_ns);
 
   size_t GetWidth() const override;
   size_t GetHeight() const override;
   const uint8_t* GetYPlane() const override;
   const uint8_t* GetUPlane() const override;
   const uint8_t* GetVPlane() const override;
   uint8_t* GetYPlane() override;
   uint8_t* GetUPlane() override;
   uint8_t* GetVPlane() override;
   int32_t GetYPitch() const override;
@@ skipping 19 matching lines @@
                             uint8_t* buffer,
                             size_t size,
                             int stride_rgb) const override;
 
   const VideoFrame* GetCopyWithRotationApplied() const override;
 
  protected:
   void SetRotation(webrtc::VideoRotation rotation) override {
     rotation_ = rotation;
   }
+  // Creates a frame from a raw sample with FourCC |format| and size |w| x |h|.
+  // |h| can be negative indicating a vertically flipped image.
+  // |dw| is destination width; can be less than |w| if cropping is desired.
+  // |dh| is destination height, like |dw|, but must be a positive number.
+  // Returns whether the function succeeded or failed.
+  bool Reset(uint32_t format,
+                     int w,
+                     int h,
+                     int dw,
+                     int dh,
+                     uint8_t* sample,
+                     size_t sample_size,
+                     int64_t time_stamp_ns,
+                     webrtc::VideoRotation rotation,
+                     bool apply_rotation);
 
  private:
   VideoFrame* CreateEmptyFrame(int w, int h,
                                int64_t time_stamp_ns) const override;
 
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
   int64_t time_stamp_ns_;
   webrtc::VideoRotation rotation_;
 
   // This is mutable as the calculation is expensive but once calculated, it
   // remains const.
   mutable std::unique_ptr<VideoFrame> rotated_frame_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_