summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 00:35:33 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 00:35:33 +0000
commitd957e43e345a02d96dff7d1861693f1bd83f0f96 (patch)
tree81cece31426d3fe18be54b8126966622ab968b35 /media
parentbca03562f14de81637074cfb3c55720afd372cc2 (diff)
downloadchromium_src-d957e43e345a02d96dff7d1861693f1bd83f0f96.zip
chromium_src-d957e43e345a02d96dff7d1861693f1bd83f0f96.tar.gz
chromium_src-d957e43e345a02d96dff7d1861693f1bd83f0f96.tar.bz2
Don't run VideoRendererBase::statistics_cb_ if we've stopped.
BUG=151733 Review URL: https://chromiumcodereview.appspot.com/11618045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/video_renderer_base.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index ea10a99..5a17940 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -255,6 +255,12 @@ void VideoRendererBase::ThreadMain() {
uint32 frames_dropped = 0;
for (;;) {
+ base::AutoLock auto_lock(lock_);
+
+ // Thread exit condition.
+ if (state_ == kStopped)
+ return;
+
if (frames_dropped > 0) {
PipelineStatistics statistics;
statistics.video_frames_dropped = frames_dropped;
@@ -263,12 +269,6 @@ void VideoRendererBase::ThreadMain() {
frames_dropped = 0;
}
- base::AutoLock auto_lock(lock_);
-
- // Thread exit condition.
- if (state_ == kStopped)
- return;
-
// Remain idle as long as we're not playing.
if (state_ != kPlaying || playback_rate_ == 0) {
frame_available_.TimedWait(kIdleTimeDelta);