Fold DecoderSelector::Abort() into the dtor.

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 44 matching lines @@
     const SetDecryptorReadyCB& set_decryptor_ready_cb)
     : task_runner_(task_runner),
       decoders_(decoders.Pass()),
       set_decryptor_ready_cb_(set_decryptor_ready_cb),
       input_stream_(NULL),
       weak_ptr_factory_(this) {}
 
 template <DemuxerStream::Type StreamType>
 DecoderSelector<StreamType>::~DecoderSelector() {
   DVLOG(2) << __FUNCTION__;
-  DCHECK(select_decoder_cb_.is_null());
+  DCHECK(task_runner_->BelongsToCurrentThread());
+
+  if (!select_decoder_cb_.is_null())
+    ReturnNullDecoder();
+
+  decoder_.reset();
+  decrypted_stream_.reset();
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::SelectDecoder(
     DemuxerStream* stream,
     bool low_delay,
     const SelectDecoderCB& select_decoder_cb,
     const typename Decoder::OutputCB& output_cb) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
@@ skipping 29 matching lines @@
   DecoderStreamTraits<StreamType>::Initialize(
       decoder_.get(),
       StreamTraits::GetDecoderConfig(*input_stream_),
       low_delay_,
       base::Bind(&DecoderSelector<StreamType>::DecryptingDecoderInitDone,
                  weak_ptr_factory_.GetWeakPtr()),
       output_cb_);
 }
 
 template <DemuxerStream::Type StreamType>
-void DecoderSelector<StreamType>::Abort() {
-  DVLOG(2) << __FUNCTION__;
-  DCHECK(task_runner_->BelongsToCurrentThread());
-
-  // Invalidate all weak pointers so that pending callbacks won't fire.
-  weak_ptr_factory_.InvalidateWeakPtrs();
-
-  decoder_.reset();
-  decrypted_stream_.reset();
-
-  if (!select_decoder_cb_.is_null())
-    ReturnNullDecoder();
-}
-
-template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::DecryptingDecoderInitDone(
     PipelineStatus status) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (status == PIPELINE_OK) {
     base::ResetAndReturn(&select_decoder_cb_)
         .Run(decoder_.Pass(), scoped_ptr<DecryptingDemuxerStream>());
     return;
   }
@@ skipping 74 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