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

Unified Diff: webrtc/common_video/video_render_frames.cc

Issue 2008513003: Let VideoRenderFrames::FrameToRender return rtc::Optional (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Revert unique_ptr change. Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/common_video/video_render_frames.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/common_video/video_render_frames.cc
diff --git a/webrtc/common_video/video_render_frames.cc b/webrtc/common_video/video_render_frames.cc
index 3e5dfe9d10f74a2e82390767b14d67795e001a89..62b317d966bee1e1cd7c081558574ae512b75089 100644
--- a/webrtc/common_video/video_render_frames.cc
+++ b/webrtc/common_video/video_render_frames.cc
@@ -53,11 +53,11 @@ int32_t VideoRenderFrames::AddFrame(const VideoFrame& new_frame) {
return static_cast<int32_t>(incoming_frames_.size());
}
-VideoFrame VideoRenderFrames::FrameToRender() {
- VideoFrame render_frame;
+rtc::Optional<VideoFrame> VideoRenderFrames::FrameToRender() {
+ rtc::Optional<VideoFrame> render_frame;
// Get the newest frame that can be released for rendering.
while (!incoming_frames_.empty() && TimeToNextFrameRelease() <= 0) {
- render_frame = incoming_frames_.front();
+ render_frame = rtc::Optional<VideoFrame>(incoming_frames_.front());
incoming_frames_.pop_front();
}
return render_frame;
« no previous file with comments | « webrtc/common_video/video_render_frames.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698