Re-land "Convert native handles to buffers before encoding."

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_video/interface/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);
-  VideoFrame(void* native_handle,
-             int width,
-             int height,
-             uint32_t timestamp,
-             int64_t render_time_ms,
-             VideoRotation rotation,
-             const rtc::Callback0<void>& no_longer_used);
 
   // TODO(pbos): Make all create/copy functions void, they should not be able to
   // fail (which should be 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.
   // Return value: 0 on success, -1 on error.
   int CreateEmptyFrame(int width,
@@ skipping 108 matching lines @@
   // longer in use, so the underlying resource can be freed.
   void* native_handle() const;
 
   // Return the underlying buffer.
   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;
+
  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_;
 };
 
 enum VideoFrameType {
@@ skipping 20 matching lines @@
   // TODO(pbos): Use webrtc::FrameType directly (and remove VideoFrameType).
   VideoFrameType _frameType = kDeltaFrame;
   uint8_t* _buffer;
   size_t _length;
   size_t _size;
   bool _completeFrame = false;
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_FRAME_H_