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

media/filters/gpu_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/gpu_video_decoder.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 80 matching lines @@
     base::MessageLoop::current()->PostTask(FROM_HERE, closure);
     return;
   }
 
   DCHECK(pending_reset_cb_.is_null());
   pending_reset_cb_ = BindToCurrentLoop(closure);
 
   vda_->Reset();
 }
 
-void GpuVideoDecoder::Stop() {
-  DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
-  if (vda_)
-    DestroyVDA();
-  DCHECK(bitstream_buffers_in_decoder_.empty());
-  if (!pending_reset_cb_.is_null())
-    base::ResetAndReturn(&pending_reset_cb_).Run();
-}
-
 static bool IsCodedSizeSupported(const gfx::Size& coded_size) {
 #if defined(OS_WIN)
   // Windows Media Foundation H.264 decoding does not support decoding videos
   // with any dimension smaller than 48 pixels:
   // http://msdn.microsoft.com/en-us/library/windows/desktop/dd797815
   if (coded_size.width() < 48 || coded_size.height() < 48)
     return false;
 #endif
 
   // Only non-Windows, Ivy Bridge+ platforms can support more than 1920x1080.
@@ skipping 433 matching lines @@
     return;
   }
 
   PutSHM(it->second.shm_buffer);
   it->second.done_cb.Run(state_ == kError ? kDecodeError : kOk);
   bitstream_buffers_in_decoder_.erase(it);
 }
 
 GpuVideoDecoder::~GpuVideoDecoder() {
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
-  // Stop should have been already called.
-  DCHECK(!vda_.get() && assigned_picture_buffers_.empty());
+  if (vda_)
+    DestroyVDA();
   DCHECK(bitstream_buffers_in_decoder_.empty());
+  DCHECK(assigned_picture_buffers_.empty());
+
+  if (!pending_reset_cb_.is_null())
+    base::ResetAndReturn(&pending_reset_cb_).Run();
+
   for (size_t i = 0; i < available_shm_segments_.size(); ++i) {
     available_shm_segments_[i]->shm->Close();
     delete available_shm_segments_[i];
   }
   available_shm_segments_.clear();
+
   for (std::map<int32, PendingDecoderBuffer>::iterator it =
            bitstream_buffers_in_decoder_.begin();
        it != bitstream_buffers_in_decoder_.end(); ++it) {
     it->second.shm_buffer->shm->Close();
   }
   bitstream_buffers_in_decoder_.clear();
 }
 
 void GpuVideoDecoder::NotifyFlushDone() {
   DVLOG(3) << "NotifyFlushDone()";
@@ skipping 26 matching lines @@
   DLOG(ERROR) << "VDA Error: " << error;
   DestroyVDA();
 }
 
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media