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

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

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 | « no previous file | webrtc/media/engine/webrtcvideoframe.cc » ('j') | 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 23 matching lines...) Expand all
34 // TODO(nisse): Deprecated. Using the default constructor violates the 34 // TODO(nisse): Deprecated. Using the default constructor violates the
35 // reasonable assumption that video_frame_buffer() returns a valid buffer. 35 // reasonable assumption that video_frame_buffer() returns a valid buffer.
36 WebRtcVideoFrame(); 36 WebRtcVideoFrame();
37 37
38 // Preferred constructor. 38 // Preferred constructor.
39 WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer, 39 WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
40 webrtc::VideoRotation rotation, 40 webrtc::VideoRotation rotation,
41 int64_t timestamp_us, 41 int64_t timestamp_us,
42 uint32_t transport_frame_id); 42 uint32_t transport_frame_id);
43 43
44 // Alternative constructor, when not knowing or caring about the
45 // transport_frame_id. Which is set to zero.
46 WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
47 webrtc::VideoRotation rotation,
48 int64_t timestamp_us);
49
44 // TODO(nisse): Deprecated, delete as soon as all callers have switched to the 50 // TODO(nisse): Deprecated, delete as soon as all callers have switched to the
45 // above constructor with microsecond timestamp. 51 // above constructor with microsecond timestamp.
46 WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer, 52 WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
47 int64_t timestamp_ns, 53 int64_t timestamp_ns,
48 webrtc::VideoRotation rotation); 54 webrtc::VideoRotation rotation);
49 55
50 ~WebRtcVideoFrame(); 56 ~WebRtcVideoFrame();
51 57
52 // Creates a frame from a raw sample with FourCC "format" and size "w" x "h". 58 // Creates a frame from a raw sample with FourCC "format" and size "w" x "h".
53 // "h" can be negative indicating a vertically flipped image. 59 // "h" can be negative indicating a vertically flipped image.
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 webrtc::VideoRotation rotation_; 130 webrtc::VideoRotation rotation_;
125 131
126 // This is mutable as the calculation is expensive but once calculated, it 132 // This is mutable as the calculation is expensive but once calculated, it
127 // remains const. 133 // remains const.
128 mutable std::unique_ptr<VideoFrame> rotated_frame_; 134 mutable std::unique_ptr<VideoFrame> rotated_frame_;
129 }; 135 };
130 136
131 } // namespace cricket 137 } // namespace cricket
132 138
133 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ 139 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoframe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698