Revert 113895 - <video> decode in hardware!

media/base/composite_filter.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 "media/base/composite_filter.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 39 matching lines @@
 }
 
 CompositeFilter::~CompositeFilter() {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   DCHECK(state_ == kCreated || state_ == kStopped);
 
   filters_.clear();
 }
 
 bool CompositeFilter::AddFilter(scoped_refptr<Filter> filter) {
-  // TODO(fischman,scherkus): s/bool/void/ the return type and CHECK on failure
-  // of the sanity-checks that return false today.
   DCHECK_EQ(message_loop_, MessageLoop::current());
   if (!filter.get() || state_ != kCreated || !host())
     return false;
 
   // Register ourselves as the filter's host.
   filter->set_host(host_impl_.get());
   filters_.push_back(make_scoped_refptr(filter.get()));
   return true;
 }
 
-void CompositeFilter::RemoveFilter(scoped_refptr<Filter> filter) {
-  DCHECK_EQ(message_loop_, MessageLoop::current());
-  if (!filter.get() || state_ != kCreated || !host())
-    LOG(FATAL) << "Unknown filter, or in unexpected state.";
-
-  bool found = false;
-  for (FilterVector::iterator it = filters_.begin();
-       it != filters_.end() && !found; ++it) {
-    if (it->get() == filter.get()) {
-      filters_.erase(it);
-      found = true;
-    }
-  }
-  filter->clear_host();
-  CHECK(found);
-}
-
 void CompositeFilter::set_host(FilterHost* host) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   DCHECK(host);
   DCHECK(!host_impl_.get());
   host_impl_.reset(new FilterHostImpl(this, host));
 }
 
 FilterHost* CompositeFilter::host() {
   return host_impl_.get() ? host_impl_->host() : NULL;
 }
@@ skipping 250 matching lines @@
 }
 
 void CompositeFilter::SerialCallback() {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   if (status_ != PIPELINE_OK) {
     // We encountered an error. Terminate the sequence now.
     ChangeState(kError);
     DispatchPendingCallback(status_);
     return;
   }
+
   if (!filters_.empty())
     sequence_index_++;
 
   if (sequence_index_ == filters_.size()) {
     // All filters have been successfully called without error.
     OnCallSequenceDone();
   } else if (GetNextState(state_) == kStopPending) {
     // Abort sequence early and start issuing Stop() calls.
     ChangeState(kStopPending);
     StartSerialCallSequence();
@@ skipping 17 matching lines @@
       DispatchPendingCallback(status_);
       return;
     }
 
     OnCallSequenceDone();
   }
 }
 
 void CompositeFilter::OnCallSequenceDone() {
   State next_state = GetNextState(state_);
+
   if (next_state == kInvalid) {
     // We somehow got into an unexpected state.
     ChangeState(kError);
     DispatchPendingCallback(PIPELINE_ERROR_INVALID_STATE);
     return;
   }
 
   ChangeState(next_state);
 
   if (state_ == kStopPending) {
@@ skipping 139 matching lines @@
 
 void CompositeFilter::FilterHostImpl::SetCurrentReadPosition(int64 offset) {
   host_->SetCurrentReadPosition(offset);
 }
 
 int64 CompositeFilter::FilterHostImpl::GetCurrentReadPosition() {
   return host_->GetCurrentReadPosition();
 }
 
 }  // namespace media