Enforce Stop() is always called before dtor in FFmepgVideoDecoder.

media/filters/ffmpeg_video_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_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 189 matching lines @@
   reset_cb_.Reset();
 }
 
 void FFmpegVideoDecoder::Stop(const base::Closure& closure) {
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(FROM_HERE, base::Bind(
         &FFmpegVideoDecoder::Stop, this, closure));
     return;
   }
 
+  if (state_ == kUninitialized) {
+    closure.Run();
+    return;
+  }
+
   if (decryptor_)
     decryptor_->CancelDecrypt();
 
   stop_cb_ = closure;
 
   // Defer stopping if a read is pending.
   if (!read_cb_.is_null())
     return;
 
   DoStop();
 }
 
 void FFmpegVideoDecoder::DoStop() {
   ReleaseFFmpegResources();
   state_ = kUninitialized;
   base::ResetAndReturn(&stop_cb_).Run();
 }
 
 FFmpegVideoDecoder::~FFmpegVideoDecoder() {
-  ReleaseFFmpegResources();
+  DCHECK_EQ(kUninitialized, state_);
+  DCHECK(!codec_context_);
+  DCHECK(!av_frame_);
 }
 
 void FFmpegVideoDecoder::DoRead(const ReadCB& read_cb) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(!read_cb.is_null());
   CHECK_NE(state_, kUninitialized);
   CHECK(read_cb_.is_null()) << "Overlapping decodes are not supported.";
 
   // Return empty frames if decoding has finished.
   if (state_ == kDecodeFinished) {
@@ skipping 281 matching lines @@
   // for damaged macroblocks, and set our error detection sensitivity.
   codec_context_->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
   codec_context_->err_recognition = AV_EF_CAREFUL;
   codec_context_->thread_count = GetThreadCount(codec_context_->codec_id);
   codec_context_->opaque = this;
   codec_context_->flags |= CODEC_FLAG_EMU_EDGE;
   codec_context_->get_buffer = GetVideoBufferImpl;
   codec_context_->release_buffer = ReleaseVideoBufferImpl;
 
   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-  if (!codec)
+  if (!codec || avcodec_open2(codec_context_, codec, NULL) < 0) {
+    ReleaseFFmpegResources();
     return false;
-
-  if (avcodec_open2(codec_context_, codec, NULL) < 0)
-    return false;
+  }
 
   av_frame_ = avcodec_alloc_frame();
   return true;
 }
 
 }  // namespace media