Revert of Cleanup of webrtc::VideoFrame.

webrtc/video_frame.h

 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef WEBRTC_VIDEO_FRAME_H_
 #define WEBRTC_VIDEO_FRAME_H_
 
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
 #include "webrtc/common_video/rotation.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 class VideoFrame {
  public:
   VideoFrame();
   VideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
              uint32_t timestamp,
              int64_t render_time_ms,
              VideoRotation rotation);
 
+  // TODO(pbos): Make all create/copy functions void, they should not be able to
+  // fail (which should be RTC_DCHECK/CHECKed instead).
+
   // CreateEmptyFrame: Sets frame dimensions and allocates buffers based
   // on set dimensions - height and plane stride.
   // If required size is bigger than the allocated one, new buffers of adequate
   // size will be allocated.
-  void CreateEmptyFrame(int width,
-                        int height,
-                        int stride_y,
-                        int stride_u,
-                        int stride_v);
+  // Return value: 0 on success, -1 on error.
+  int CreateEmptyFrame(int width,
+                       int height,
+                       int stride_y,
+                       int stride_u,
+                       int stride_v);
 
   // CreateFrame: Sets the frame's members and buffers. If required size is
   // bigger than allocated one, new buffers of adequate size will be allocated.
-  void CreateFrame(const uint8_t* buffer_y,
-                   const uint8_t* buffer_u,
-                   const uint8_t* buffer_v,
-                   int width,
-                   int height,
-                   int stride_y,
-                   int stride_u,
-                   int stride_v,
-                   VideoRotation rotation);
+  // Return value: 0 on success, -1 on error.
+  int CreateFrame(const uint8_t* buffer_y,
+                  const uint8_t* buffer_u,
+                  const uint8_t* buffer_v,
+                  int width,
+                  int height,
+                  int stride_y,
+                  int stride_u,
+                  int stride_v);
+
+  // TODO(guoweis): remove the previous CreateFrame when chromium has this code.
+  int CreateFrame(const uint8_t* buffer_y,
+                  const uint8_t* buffer_u,
+                  const uint8_t* buffer_v,
+                  int width,
+                  int height,
+                  int stride_y,
+                  int stride_u,
+                  int stride_v,
+                  VideoRotation rotation);
 
   // CreateFrame: Sets the frame's members and buffers. If required size is
   // bigger than allocated one, new buffers of adequate size will be allocated.
   // |buffer| must be a packed I420 buffer.
-  void CreateFrame(const uint8_t* buffer,
+  // Return value: 0 on success, -1 on error.
+  int CreateFrame(const uint8_t* buffer,
                   int width,
                   int height,
                   VideoRotation rotation);
 
   // Deep copy frame: If required size is bigger than allocated one, new
   // buffers of adequate size will be allocated.
-  void CopyFrame(const VideoFrame& videoFrame);
+  // Return value: 0 on success, -1 on error.
+  int CopyFrame(const VideoFrame& videoFrame);
 
   // Creates a shallow copy of |videoFrame|, i.e, the this object will retain a
   // reference to the video buffer also retained by |videoFrame|.
   void ShallowCopy(const VideoFrame& videoFrame);
 
   // Release frame buffer and reset time stamps.
   void Reset();
 
   // Get pointer to buffer per plane.
   uint8_t* buffer(PlaneType type);
@@ skipping 61 matching lines @@
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const;
 
   // Set the underlying buffer.
   void set_video_frame_buffer(
       const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer);
 
   // Convert native-handle frame to memory-backed I420 frame. Should not be
   // called on a non-native-handle frame.
   VideoFrame ConvertNativeToI420Frame() const;
 
+  bool EqualsFrame(const VideoFrame& frame) const;
+
  private:
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
   uint32_t timestamp_;
   int64_t ntp_time_ms_;
   int64_t render_time_ms_;
   VideoRotation rotation_;
 };
 
 
@@ skipping 32 matching lines @@
   uint8_t* _buffer;
   size_t _length;
   size_t _size;
   bool _completeFrame = false;
   AdaptReason adapt_reason_;
   int qp_ = -1;  // Quantizer value.
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_FRAME_H_