Merge 70669 - Don't uninitialize FFmpegVideoDecodeEngine if we haven't initia...

media/filters/ffmpeg_video_decoder.cc

 // Copyright (c) 2010 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 <deque>
 
 #include "base/task.h"
 #include "media/base/callback.h"
@@ skipping 79 matching lines @@
     case CODEC_ID_MPEG4:
       config.codec = kCodecMPEG4; break;
     case CODEC_ID_VP8:
       config.codec = kCodecVP8; break;
     default:
       NOTREACHED();
   }
   config.opaque_context = av_stream;
   config.width = width_;
   config.height = height_;
+  state_ = kInitializing;
   decode_engine_->Initialize(message_loop(), this, NULL, config);
 }
 
 void FFmpegVideoDecoder::OnInitializeComplete(const VideoCodecInfo& info) {
   DCHECK_EQ(MessageLoop::current(), message_loop());
   DCHECK(initialize_callback_.get());
 
   info_ = info;  // Save a copy.
 
   if (info.success) {
@@ skipping 22 matching lines @@
                              NewRunnableMethod(this,
                                                &FFmpegVideoDecoder::Stop,
                                                callback));
     return;
   }
 
   DCHECK_EQ(MessageLoop::current(), message_loop());
   DCHECK(!uninitialize_callback_.get());
 
   uninitialize_callback_.reset(callback);
-  decode_engine_->Uninitialize();
+  if (state_ != kUnInitialized)
+    decode_engine_->Uninitialize();
+  else
+    OnUninitializeComplete();
 }
 
 void FFmpegVideoDecoder::OnUninitializeComplete() {
   DCHECK_EQ(MessageLoop::current(), message_loop());
   DCHECK(uninitialize_callback_.get());
 
   AutoCallbackRunner done_runner(uninitialize_callback_.release());
   state_ = kStopped;
 
   // TODO(jiesun): Destroy the decoder context.
@@ skipping 279 matching lines @@
       VideoFrameReady(video_frame);
   }
 }
 
 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest(
     VideoDecodeEngine* engine) {
   decode_engine_.reset(engine);
 }
 
 }  // namespace media