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

Side by Side Diff: media/base/null_video_sink.cc

Issue 2282963002: Do not use NullVideoSink::new_frame_cb_ if NULL. (Closed)
Patch Set: Created 4 years, 3 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 | 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/null_video_sink.h" 5 #include "media/base/null_video_sink.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 85 }
86 86
87 task_runner_->PostDelayedTask(FROM_HERE, cancelable_worker_.callback(), 87 task_runner_->PostDelayedTask(FROM_HERE, cancelable_worker_.callback(),
88 delay); 88 delay);
89 } 89 }
90 90
91 void NullVideoSink::PaintSingleFrame(const scoped_refptr<VideoFrame>& frame, 91 void NullVideoSink::PaintSingleFrame(const scoped_refptr<VideoFrame>& frame,
92 bool repaint_duplicate_frame) { 92 bool repaint_duplicate_frame) {
93 if (!repaint_duplicate_frame && frame == last_frame_) 93 if (!repaint_duplicate_frame && frame == last_frame_)
94 return; 94 return;
95
95 last_frame_ = frame; 96 last_frame_ = frame;
96 new_frame_cb_.Run(frame); 97 if (!new_frame_cb_.is_null())
98 new_frame_cb_.Run(frame);
97 } 99 }
98 100
99 } // namespace media 101 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698