Demuxer stream now uses a callback instead of Assignable template. Cleaning ...

media/filters/decoder_base.h

 // Copyright (c) 2009 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.
 
 // A base class that provides the plumbing for a decoder filters.
 
 #ifndef MEDIA_FILTERS_DECODER_BASE_H_
 #define MEDIA_FILTERS_DECODER_BASE_H_
 
 #include <deque>
@@ skipping 52 matching lines @@
   // Audio or Video decoder.
   virtual void Read(Assignable<Output>* output) {
     AutoLock auto_lock(lock_);
     if (IsRunning()) {
       output->AddRef();
       output_queue_.push_back(output);
       ScheduleProcessTask();
     }
   }
 
-  // AssignableBuffer callback.
-  virtual void OnAssignment(Buffer* buffer) {
+  void OnReadComplete(Buffer* buffer) {
     AutoLock auto_lock(lock_);
     if (IsRunning()) {
       buffer->AddRef();
       input_queue_.push_back(buffer);
       --pending_reads_;
       ScheduleProcessTask();
     }
   }
 
  protected:
@@ skipping 91 matching lines @@
     bool did_read = false;
     if (IsRunning() &&
         pending_reads_ + input_queue_.size() < output_queue_.size()) {
       did_read = true;
       size_t read = output_queue_.size() - pending_reads_ - input_queue_.size();
       pending_reads_ += read;
       {
         AutoUnlock unlock(lock_);
         while (read) {
           demuxer_stream_->
-              Read(new AssignableBuffer<DecoderBase, Buffer>(this));
+              Read(NewCallback(this, &DecoderBase::OnReadComplete));
           --read;
         }
       }
     }
     return did_read;
   }
 
   // If the |input_queue_| has any buffers, this method will call the derived
   // class's OnDecode() method.
   bool ProcessInput() {
@@ skipping 90 matching lines @@
   // Queue of buffers supplied by the renderer through the Read() method.
   typedef std::deque<Assignable<Output>*> OutputQueue;
   OutputQueue output_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_BASE_H_