Skip to content
Snippets Groups Projects
Commit 8d72f27c authored by skerner@chromium.org's avatar skerner@chromium.org
Browse files

Revert 70077 - Don't uninitialize FFmpegVideoDecodeEngine if we haven't initialized it.

BUG=67303
TEST=media_unittests

Review URL: http://codereview.chromium.org/6046006

TBR=scherkus@chromium.org
Review URL: http://codereview.chromium.org/5970011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70092 0039d316-1c4b-4281-b951-d872f2087c98
parent 9d5c04b2
No related merge requests found
......@@ -97,7 +97,6 @@ void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream,
config.opaque_context = av_stream;
config.width = width_;
config.height = height_;
state_ = kInitializing;
decode_engine_->Initialize(message_loop(), this, NULL, config);
}
......@@ -140,10 +139,7 @@ void FFmpegVideoDecoder::Stop(FilterCallback* callback) {
DCHECK(!uninitialize_callback_.get());
uninitialize_callback_.reset(callback);
if (state_ != kUnInitialized)
decode_engine_->Uninitialize();
else
OnUninitializeComplete();
decode_engine_->Uninitialize();
}
void FFmpegVideoDecoder::OnUninitializeComplete() {
......
......@@ -72,7 +72,6 @@ class FFmpegVideoDecoder : public VideoDecoder,
enum DecoderState {
kUnInitialized,
kInitializing,
kNormal,
kFlushCodec,
kDecodeFinished,
......
......@@ -160,15 +160,12 @@ class FFmpegVideoDecoderTest : public testing::Test {
}
virtual ~FFmpegVideoDecoderTest() {
// We had to set this because not all tests had initialized the engine.
engine_->event_handler_ = decoder_.get();
EXPECT_CALL(callback_, OnFilterCallback());
EXPECT_CALL(callback_, OnCallbackDestroyed());
// The presence of an event handler means we need to uninitialize.
if (engine_->event_handler_) {
EXPECT_CALL(*engine_, Uninitialize())
.WillOnce(EngineUninitialize(engine_));
}
EXPECT_CALL(*engine_, Uninitialize())
.WillOnce(EngineUninitialize(engine_));
decoder_->Stop(callback_.NewCallback());
// Finish up any remaining tasks.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment