Fold {Audio|Video}Decoder::Stop() into the dtor.

media/filters/ffmpeg_audio_decoder.cc

 // Copyright (c) 2012 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/filters/ffmpeg_audio_decoder.h"
 
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_bus.h"
@@ skipping 117 matching lines @@
 FFmpegAudioDecoder::FFmpegAudioDecoder(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     const LogCB& log_cb)
     : task_runner_(task_runner),
       state_(kUninitialized),
       av_sample_format_(0),
       log_cb_(log_cb) {
 }
 
 FFmpegAudioDecoder::~FFmpegAudioDecoder() {
-  DCHECK_EQ(state_, kUninitialized);
-  DCHECK(!codec_context_);
-  DCHECK(!av_frame_);
+  DCHECK(task_runner_->BelongsToCurrentThread());
+
+  if (state_ != kUninitialized) {
+    ReleaseFFmpegResources();
+    ResetTimestampState();
+  }
 }
 
 void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config,
                                     const PipelineStatusCB& status_cb,
                                     const OutputCB& output_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!config.is_encrypted());
 
   FFmpegGlue::InitializeFFmpeg();
 
@@ skipping 34 matching lines @@
 
 void FFmpegAudioDecoder::Reset(const base::Closure& closure) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   avcodec_flush_buffers(codec_context_.get());
   state_ = kNormal;
   ResetTimestampState();
   task_runner_->PostTask(FROM_HERE, closure);
 }
 
-void FFmpegAudioDecoder::Stop() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-
-  if (state_ == kUninitialized)
-    return;
-
-  ReleaseFFmpegResources();
-  ResetTimestampState();
-  state_ = kUninitialized;
-}
-
 void FFmpegAudioDecoder::DecodeBuffer(
     const scoped_refptr<DecoderBuffer>& buffer,
     const DecodeCB& decode_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_NE(state_, kUninitialized);
   DCHECK_NE(state_, kDecodeFinished);
   DCHECK_NE(state_, kError);
   DCHECK(buffer);
 
   // Make sure we are notified if http://crbug.com/49709 returns.  Issue also
@@ skipping 176 matching lines @@
 
   ResetTimestampState();
   return true;
 }
 
 void FFmpegAudioDecoder::ResetTimestampState() {
   discard_helper_->Reset(config_.codec_delay());
 }
 
 }  // namespace media