Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: webrtc/media/engine/webrtcvideoframe.cc

Issue 2262683002: WebRtcVideoFrame constructor without transport_frame_id. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/media/engine/webrtcvideoframe.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 19 matching lines...) Expand all
30 webrtc::VideoRotation rotation, 30 webrtc::VideoRotation rotation,
31 int64_t timestamp_us, 31 int64_t timestamp_us,
32 uint32_t transport_frame_id) 32 uint32_t transport_frame_id)
33 : video_frame_buffer_(buffer), 33 : video_frame_buffer_(buffer),
34 timestamp_us_(timestamp_us), 34 timestamp_us_(timestamp_us),
35 transport_frame_id_(transport_frame_id), 35 transport_frame_id_(transport_frame_id),
36 rotation_(rotation) {} 36 rotation_(rotation) {}
37 37
38 WebRtcVideoFrame::WebRtcVideoFrame( 38 WebRtcVideoFrame::WebRtcVideoFrame(
39 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer, 39 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
40 webrtc::VideoRotation rotation,
41 int64_t timestamp_us)
42 : WebRtcVideoFrame(buffer, rotation, timestamp_us, 0) {};
43
44 WebRtcVideoFrame::WebRtcVideoFrame(
45 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
40 int64_t time_stamp_ns, 46 int64_t time_stamp_ns,
41 webrtc::VideoRotation rotation) 47 webrtc::VideoRotation rotation)
42 : WebRtcVideoFrame(buffer, 48 : WebRtcVideoFrame(buffer,
43 rotation, 49 rotation,
44 time_stamp_ns / rtc::kNumNanosecsPerMicrosec, 50 time_stamp_ns / rtc::kNumNanosecsPerMicrosec,
45 0) {} 51 0) {}
46 52
47 WebRtcVideoFrame::~WebRtcVideoFrame() {} 53 WebRtcVideoFrame::~WebRtcVideoFrame() {}
48 54
49 bool WebRtcVideoFrame::Init(uint32_t format, 55 bool WebRtcVideoFrame::Init(uint32_t format,
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 static_cast<libyuv::RotationMode>(rotation())); 222 static_cast<libyuv::RotationMode>(rotation()));
217 if (ret == 0) { 223 if (ret == 0) {
218 rotated_frame_.reset(new WebRtcVideoFrame( 224 rotated_frame_.reset(new WebRtcVideoFrame(
219 buffer, webrtc::kVideoRotation_0, timestamp_us_, transport_frame_id_)); 225 buffer, webrtc::kVideoRotation_0, timestamp_us_, transport_frame_id_));
220 } 226 }
221 227
222 return rotated_frame_.get(); 228 return rotated_frame_.get();
223 } 229 }
224 230
225 } // namespace cricket 231 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoframe.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698