diff options
| author | ashokm@nvidia.com <ashokm@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 16:39:40 +0000 |
|---|---|---|
| committer | ashokm@nvidia.com <ashokm@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 16:39:40 +0000 |
| commit | 2d84f38d8436b224904e95a68bb69ea05d302cb3 (patch) | |
| tree | be1c7216934ad06f932cd677ac25147cfc47acb1 | |
| parent | f1b6f9913b28729da36b4d683a2689ec9c5e4191 (diff) | |
| download | chromium_src-2d84f38d8436b224904e95a68bb69ea05d302cb3.zip chromium_src-2d84f38d8436b224904e95a68bb69ea05d302cb3.tar.gz chromium_src-2d84f38d8436b224904e95a68bb69ea05d302cb3.tar.bz2 | |
ovda: fix the issue in calling destroy() after reset()
When destroy() is called after reset(), there is an initiation
of invalid state change, from LOADED to EXECUTE.
Fixed the same.
Review URL: http://codereview.chromium.org/8050012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103475 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/common/gpu/media/omx_video_decode_accelerator.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/common/gpu/media/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc index 21c1d92..0bdf42c 100644 --- a/content/common/gpu/media/omx_video_decode_accelerator.cc +++ b/content/common/gpu/media/omx_video_decode_accelerator.cc @@ -898,8 +898,9 @@ void OmxVideoDecodeAccelerator::EventHandlerCompleteTask(OMX_EVENTTYPE event, DispatchStateReached(static_cast<OMX_STATETYPE>(data2)); return; case OMX_CommandFlush: - DCHECK(current_state_change_ == RESETTING || - current_state_change_ == DESTROYING); + if (current_state_change_ == DESTROYING) + return; + DCHECK(current_state_change_ == RESETTING); if (data2 == input_port_) InputPortFlushDone(); else if (data2 == output_port_) |