summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorwjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 16:51:22 +0000
committerwjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 16:51:22 +0000
commite610074b51e9d57281152a6e6ae73a493fb4e42c (patch)
tree88050a80d2d7a8f66468b0f974f475014384ca46 /media
parente04336f9d582160d5a72f9f12a8d192b2922b3b6 (diff)
downloadchromium_src-e610074b51e9d57281152a6e6ae73a493fb4e42c.zip
chromium_src-e610074b51e9d57281152a6e6ae73a493fb4e42c.tar.gz
chromium_src-e610074b51e9d57281152a6e6ae73a493fb4e42c.tar.bz2
set client state to kClientInitializing a little earlier in order to satisfy pipeline checking
Contributed by wjia@chromium.org BUG=none TEST=tested with omx_test on tegra Review URL: http://codereview.chromium.org/2234009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/omx_video_decode_engine.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/filters/omx_video_decode_engine.cc b/media/filters/omx_video_decode_engine.cc
index a11660e..5af29e6 100644
--- a/media/filters/omx_video_decode_engine.cc
+++ b/media/filters/omx_video_decode_engine.cc
@@ -105,6 +105,7 @@ void OmxVideoDecodeEngine::Initialize(
message_loop_->PostTask(FROM_HERE,
NewRunnableMethod(this, &OmxVideoDecodeEngine::InitializeTask));
+ client_state_ = kClientInitializing;
}
// This method handles only input buffer, without coupling with output
@@ -238,12 +239,11 @@ void OmxVideoDecodeEngine::OnStopDone() {
// Function sequence for initializing
void OmxVideoDecodeEngine::InitializeTask() {
DCHECK_EQ(message_loop_, MessageLoop::current());
- DCHECK_EQ(client_state_, kClientNotInitialized);
+ DCHECK_EQ(client_state_, kClientInitializing);
DCHECK_EQ(il_state_, kIlNone);
il_state_ = kIlNone;
expected_il_state_ = kIlLoaded;
- client_state_ = kClientInitializing;
input_port_enabled_ = true;
output_port_state_ = kPortEnabled;
if (!CreateComponent()) {