Revert 113895 - <video> decode in hardware!

media/filters/video_renderer_base.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/threading/platform_thread.h"
 #include "media/base/buffers.h"
 #include "media/base/filter_host.h"
 #include "media/base/limits.h"
@@ skipping 79 matching lines @@
   // Signal the subclass we're stopping.
   OnStop(callback);
 }
 
 void VideoRendererBase::SetPlaybackRate(float playback_rate) {
   base::AutoLock auto_lock(lock_);
   playback_rate_ = playback_rate;
 }
 
 void VideoRendererBase::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
-  base::AutoLock auto_lock(lock_);
-  DCHECK_EQ(state_, kFlushed) << "Must flush prior to seeking.";
-  DCHECK(!cb.is_null());
-  DCHECK(seek_cb_.is_null());
+  {
+    base::AutoLock auto_lock(lock_);
+    DCHECK_EQ(state_, kFlushed) << "Must flush prior to seeking.";
+    DCHECK(!cb.is_null());
+    DCHECK(seek_cb_.is_null());
 
-  state_ = kSeeking;
-  seek_cb_ = cb;
-  seek_timestamp_ = time;
-  AttemptRead_Locked();
+    state_ = kSeeking;
+    seek_cb_ = cb;
+    seek_timestamp_ = time;
+    AttemptRead_Locked();
+  }
 }
 
 void VideoRendererBase::Initialize(VideoDecoder* decoder,
                                    const base::Closure& callback,
                                    const StatisticsCallback& stats_callback) {
   base::AutoLock auto_lock(lock_);
   DCHECK(decoder);
   DCHECK(!callback.is_null());
   DCHECK(!stats_callback.is_null());
   DCHECK_EQ(kUninitialized, state_);
@@ skipping 148 matching lines @@
 
         // Still a chance we can render the frame!
         if (remaining_time.InMicroseconds() > 0)
           break;
 
         // Frame dropped: read again.
         ++frames_dropped;
         frames_queue_ready_.pop_front();
         AttemptRead_Locked();
       }
+
       // Continue waiting for the current paint to finish.
       continue;
     }
 
     // Congratulations! You've made it past the video frame timing gauntlet.
     //
     // We can now safely update the current frame, request another frame, and
     // signal to the client that a new frame is available.
     DCHECK(!pending_paint_);
     DCHECK(!frames_queue_ready_.empty());
@@ skipping 182 matching lines @@
   return base::TimeDelta::FromMicroseconds(
       static_cast<int64>(sleep.InMicroseconds() / playback_rate));
 }
 
 void VideoRendererBase::DoStopOrError_Locked() {
   DCHECK(!pending_paint_);
   DCHECK(!pending_paint_with_last_available_);
   lock_.AssertAcquired();
   current_frame_ = NULL;
   last_available_frame_ = NULL;
+  DCHECK(!pending_read_);
 }
 
 }  // namespace media