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

Unified Diff: webrtc/common_video/incoming_video_stream.cc

Issue 2008513003: Let VideoRenderFrames::FrameToRender return rtc::Optional (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 | « no previous file | webrtc/common_video/video_render_frames.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/common_video/incoming_video_stream.cc
diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc
index 5fc8eae0bd570ae4c52f335c0d383a2c182f4361..7bc24861b8320b527542e22453431579af72735a 100644
--- a/webrtc/common_video/incoming_video_stream.cc
+++ b/webrtc/common_video/incoming_video_stream.cc
@@ -175,7 +175,7 @@ bool IncomingVideoStream::IncomingVideoStreamProcess() {
}
// Get a new frame to render and the time for the frame after this one.
- VideoFrame frame_to_render;
+ rtc::Optional<VideoFrame> frame_to_render;
uint32_t wait_time;
{
rtc::CritScope cs(&buffer_critsect_);
@@ -189,17 +189,14 @@ bool IncomingVideoStream::IncomingVideoStreamProcess() {
}
deliver_buffer_event_->StartTimer(false, wait_time);
- DeliverFrame(frame_to_render);
+ if (frame_to_render)
+ DeliverFrame(*frame_to_render);
}
return true;
}
void IncomingVideoStream::DeliverFrame(const VideoFrame& video_frame) {
rtc::CritScope cs(&thread_critsect_);
- if (video_frame.IsZeroSize()) {
- // No frame.
- return;
- }
// Send frame for rendering.
if (external_callback_) {
« no previous file with comments | « no previous file | webrtc/common_video/video_render_frames.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698