From 4381700fccc6a1d2f39e1397f4007c6d7f076541 Mon Sep 17 00:00:00 2001 From: nisse Date: Mon, 22 Aug 2016 03:54:53 -0700 Subject: [PATCH] WebRtcVideoFrame constructor without transport_frame_id. Needed as a substitute when eliminating the Copy method. BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2262683002 Cr-Commit-Position: refs/heads/master@{#13843} --- webrtc/media/engine/webrtcvideoframe.cc | 6 ++++++ webrtc/media/engine/webrtcvideoframe.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/webrtc/media/engine/webrtcvideoframe.cc b/webrtc/media/engine/webrtcvideoframe.cc index 676f715596..71219d13f9 100644 --- a/webrtc/media/engine/webrtcvideoframe.cc +++ b/webrtc/media/engine/webrtcvideoframe.cc @@ -35,6 +35,12 @@ WebRtcVideoFrame::WebRtcVideoFrame( transport_frame_id_(transport_frame_id), rotation_(rotation) {} +WebRtcVideoFrame::WebRtcVideoFrame( + const rtc::scoped_refptr& buffer, + webrtc::VideoRotation rotation, + int64_t timestamp_us) + : WebRtcVideoFrame(buffer, rotation, timestamp_us, 0) {}; + WebRtcVideoFrame::WebRtcVideoFrame( const rtc::scoped_refptr& buffer, int64_t time_stamp_ns, diff --git a/webrtc/media/engine/webrtcvideoframe.h b/webrtc/media/engine/webrtcvideoframe.h index d7acc6fc14..bdf5a02a62 100644 --- a/webrtc/media/engine/webrtcvideoframe.h +++ b/webrtc/media/engine/webrtcvideoframe.h @@ -41,6 +41,12 @@ class WebRtcVideoFrame : public VideoFrame { int64_t timestamp_us, uint32_t transport_frame_id); + // Alternative constructor, when not knowing or caring about the + // transport_frame_id. Which is set to zero. + WebRtcVideoFrame(const rtc::scoped_refptr& buffer, + webrtc::VideoRotation rotation, + int64_t timestamp_us); + // TODO(nisse): Deprecated, delete as soon as all callers have switched to the // above constructor with microsecond timestamp. WebRtcVideoFrame(const rtc::scoped_refptr& buffer,