| Index: webrtc/video_frame.h
|
| diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h
|
| index ea550aba881c5be0dfdd882235f3345744fbd231..d70a746daeb49334193c99d522cefd275615981c 100644
|
| --- a/webrtc/video_frame.h
|
| +++ b/webrtc/video_frame.h
|
| @@ -25,13 +25,6 @@ class VideoFrame {
|
| 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).
|
| @@ -160,6 +153,10 @@ class VideoFrame {
|
| 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_;
|
|
|