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

media/filters/decoder_selector.cc

 // 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.
 
 #include "decoder_selector.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 51 matching lines @@
 template <DemuxerStream::Type StreamType>
 DecoderSelector<StreamType>::~DecoderSelector() {
   DVLOG(2) << __FUNCTION__;
   DCHECK(select_decoder_cb_.is_null());
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::SelectDecoder(
     DemuxerStream* stream,
     bool low_delay,
-    const SelectDecoderCB& select_decoder_cb,
-    const typename Decoder::OutputCB& output_cb) {
+    const SelectDecoderCB& select_decoder_cb) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(stream);
 
   // Make sure |select_decoder_cb| runs on a different execution stack.
   select_decoder_cb_ = BindToCurrentLoop(select_decoder_cb);
 
   if (!HasValidStreamConfig(stream)) {
     DLOG(ERROR) << "Invalid stream config.";
     ReturnNullDecoder();
     return;
   }
 
   input_stream_ = stream;
   low_delay_ = low_delay;
-  output_cb_ = output_cb;
 
   if (!IsStreamEncrypted(input_stream_)) {
     InitializeDecoder();
     return;
   }
 
   // This could happen if Encrypted Media Extension (EME) is not enabled.
   if (set_decryptor_ready_cb_.is_null()) {
     ReturnNullDecoder();
     return;
   }
 
   decoder_.reset(new typename StreamTraits::DecryptingDecoderType(
       task_runner_, set_decryptor_ready_cb_));
 
   DecoderStreamTraits<StreamType>::Initialize(
       decoder_.get(),
       StreamTraits::GetDecoderConfig(*input_stream_),
       low_delay_,
       base::Bind(&DecoderSelector<StreamType>::DecryptingDecoderInitDone,
-                 weak_ptr_factory_.GetWeakPtr()),
-      output_cb_);
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::Abort() {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // This could happen when SelectDecoder() was not called or when
   // |select_decoder_cb_| was already posted but not fired (e.g. in the
   // message loop queue).
@@ skipping 74 matching lines @@
   }
 
   decoder_.reset(decoders_.front());
   decoders_.weak_erase(decoders_.begin());
 
   DecoderStreamTraits<StreamType>::Initialize(
       decoder_.get(),
       StreamTraits::GetDecoderConfig(*input_stream_),
       low_delay_,
       base::Bind(&DecoderSelector<StreamType>::DecoderInitDone,
-                 weak_ptr_factory_.GetWeakPtr()),
-      output_cb_);
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::DecoderInitDone(PipelineStatus status) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (status != PIPELINE_OK) {
     decoder_.reset();
     InitializeDecoder();
@@ skipping 15 matching lines @@
 
 // These forward declarations tell the compiler that we will use
 // DecoderSelector with these arguments, allowing us to keep these definitions
 // in our .cc without causing linker errors. This also means if anyone tries to
 // instantiate a DecoderSelector with anything but these two specializations
 // they'll most likely get linker errors.
 template class DecoderSelector<DemuxerStream::AUDIO>;
 template class DecoderSelector<DemuxerStream::VIDEO>;
 
 }  // namespace media