aboutsummaryrefslogtreecommitdiff
path: root/webrtc/video_frame.h
diff options
context:
space:
mode:
authorperkj@webrtc.org <perkj@webrtc.org>2015-03-06 12:37:19 +0000
committerperkj@webrtc.org <perkj@webrtc.org>2015-03-06 12:38:22 +0000
commitbcead305a2f27c30c72c6a3824fdf12f4b83c2eb (patch)
tree1ce2b74e44dadabe4945c3abcbefcafc9fd1701b /webrtc/video_frame.h
parent75e850e192aabe57b5a376d2127950acfffff7c6 (diff)
downloadwebrtc-bcead305a2f27c30c72c6a3824fdf12f4b83c2eb.tar.gz
Make the entry point for VideoFrames to webrtc const ref I420VideoFrame.
This removes the none const pointer entry and SwapFrame. Since frames delivered using VideoSendStream no longer use the external capture module, VideoSendStream will not get an incoming framerate callback. VideoSendStream now uses a rtc::RateTracker. Also, the video engine must ensure that time stamps are always increasing. With this, time stamps (ntp, render_time and rtp timestamps ) are checked and set in ViECapturer::OnIncomingCapturedFrame BUG=1128 R=magjed@webrtc.org, mflodman@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/46429004 Cr-Commit-Position: refs/heads/master@{#8633} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8633 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/video_frame.h')
-rw-r--r--webrtc/video_frame.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h
index f207c1ace6..385907278f 100644
--- a/webrtc/video_frame.h
+++ b/webrtc/video_frame.h
@@ -73,11 +73,15 @@ class I420VideoFrame {
int stride_v,
VideoRotation rotation);
- // Copy frame: If required size is bigger than allocated one, new buffers of
- // adequate size will be allocated.
+ // Deep copy frame: If required size is bigger than allocated one, new
+ // buffers of adequate size will be allocated.
// Return value: 0 on success, -1 on error.
int CopyFrame(const I420VideoFrame& 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 I420VideoFrame& videoFrame);
+
// Make a copy of |this|. The caller owns the returned frame.
// Return value: a new frame on success, NULL on error.
I420VideoFrame* CloneFrame() const;