Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..."

media/filters/decoder_selector.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FILTERS_DECODER_SELECTOR_H_
 #define MEDIA_FILTERS_DECODER_SELECTOR_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 46 matching lines @@
       const scoped_refptr<base::SingleThreadTaskRunner>& message_loop,
       ScopedVector<Decoder> decoders,
       const SetDecryptorReadyCB& set_decryptor_ready_cb);
   ~DecoderSelector();
 
   // Initializes and selects a Decoder that can decode the |stream|.
   // Selected Decoder (and DecryptingDemuxerStream) is returned via
   // the |select_decoder_cb|.
   void SelectDecoder(DemuxerStream* stream,
                      bool low_delay,
-                     const SelectDecoderCB& select_decoder_cb,
-                     const typename Decoder::OutputCB& output_cb);
+                     const SelectDecoderCB& select_decoder_cb);
 
   // Aborts pending Decoder selection and fires |select_decoder_cb| with
   // NULL and NULL immediately if it's pending.
   void Abort();
 
  private:
   void DecryptingDecoderInitDone(PipelineStatus status);
   void DecryptingDemuxerStreamInitDone(PipelineStatus status);
   void InitializeDecoder();
   void DecoderInitDone(PipelineStatus status);
   void ReturnNullDecoder();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   ScopedVector<Decoder> decoders_;
   SetDecryptorReadyCB set_decryptor_ready_cb_;
 
   DemuxerStream* input_stream_;
   bool low_delay_;
   SelectDecoderCB select_decoder_cb_;
-  typename Decoder::OutputCB output_cb_;
 
   scoped_ptr<Decoder> decoder_;
   scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector);
 };
 
 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_SELECTOR_H_