Index: webrtc/media/base/videoframe.h |
diff --git a/webrtc/media/base/videoframe.h b/webrtc/media/base/videoframe.h |
index 950f88848f6cbfb0191199dcea433a87d7fb37d6..c8bfe4827802aa03f8d846de7e9e704831116191 100644 |
--- a/webrtc/media/base/videoframe.h |
+++ b/webrtc/media/base/videoframe.h |
@@ -56,9 +56,13 @@ class VideoFrame { |
// frame buffer. |
virtual VideoFrame *Copy() const = 0; |
- // Since VideoFrame supports shallow copy and the internal frame buffer might |
- // be shared, this function can be used to check exclusive ownership. |
- virtual bool IsExclusive() const = 0; |
+ // Create a new frame with a given buffer and meta data. |
+ // TODO(nisse): Needed by VideoFactory. Must be deleted for merge of |
magjed_webrtc
2016/05/25 13:17:01
I don't see the need for this function. Why not us
nisse-webrtc
2016/05/25 13:39:47
It's used in VideoFrameFactory::CreateAliasedFrame
magjed_webrtc
2016/05/25 14:56:07
No, we don't have to care about that. The only imp
nisse-webrtc
2016/05/26 07:44:42
I see. I'll try that then.
|
+ // cricket::VideoFrame and webrtc::VideoFrame. |
+ virtual std::unique_ptr<VideoFrame> CreateWithBuffer( |
+ const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer, |
+ webrtc::VideoRotation rotation, |
+ int64_t timestamp_us) const = 0; |
// Return a copy of frame which has its pending rotation applied. The |
// ownership of the returned frame is held by this frame. |
@@ -95,13 +99,6 @@ class VideoFrame { |
virtual void StretchToFrame(VideoFrame *target, bool interpolate, |
bool crop) const; |
- // Stretches the frame to the given size, creating a new VideoFrame object to |
- // hold it. The parameter "interpolate" controls whether to interpolate or |
- // just take the nearest-point. The parameter "crop" controls whether to crop |
- // this frame to the aspect ratio of the given dimensions before stretching. |
- virtual VideoFrame *Stretch(size_t w, size_t h, bool interpolate, |
- bool crop) const; |
- |
// Sets the video frame to black. |
virtual bool SetToBlack(); |
@@ -128,6 +125,7 @@ class VideoFrame { |
virtual VideoFrame* CreateEmptyFrame(int w, |
int h, |
int64_t timestamp_us) const = 0; |
+ |
virtual void set_rotation(webrtc::VideoRotation rotation) = 0; |
}; |