diff options
| author | ashokm@nvidia.com <ashokm@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 09:35:33 +0000 |
|---|---|---|
| committer | ashokm@nvidia.com <ashokm@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 09:35:33 +0000 |
| commit | b55eee2380d7b5680092b0c7ac328d976f96428d (patch) | |
| tree | b1173796f9496b8bde9da377fa057ea0697abd6a | |
| parent | bf3bbdccdeb3c9fb24286c7a08d7e33331dccbb5 (diff) | |
| download | chromium_src-b55eee2380d7b5680092b0c7ac328d976f96428d.zip chromium_src-b55eee2380d7b5680092b0c7ac328d976f96428d.tar.gz chromium_src-b55eee2380d7b5680092b0c7ac328d976f96428d.tar.bz2 | |
ovda: allow the setting of profile to be optional
Currently, ovda is expecting profile to sent in initialize().
Change this to be optional.
Test=ovda unit test, gles2 sample plugin
Review URL: http://codereview.chromium.org/7741012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98565 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/common/gpu/media/omx_video_decode_accelerator.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/common/gpu/media/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc index 3c52456..89acf72 100644 --- a/content/common/gpu/media/omx_video_decode_accelerator.cc +++ b/content/common/gpu/media/omx_video_decode_accelerator.cc @@ -515,7 +515,8 @@ void OmxVideoDecodeAccelerator::OnReachedIdleInInitializing() { DCHECK_EQ(client_state_, OMX_StateLoaded); client_state_ = OMX_StateIdle; // Query the resources with the component. - if (component_name_is_nvidia_h264ext_) { + if (component_name_is_nvidia_h264ext_ && + (profile_ != OMX_VIDEO_AVCProfileMax)) { OMX_INDEXTYPE extension_index; OMX_ERRORTYPE result = OMX_GetExtensionIndex( component_handle_, |