summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-30 17:08:31 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-30 17:08:31 +0000
commitaf3594e07f3b8e43c547d5bab900cd15b23b0208 (patch)
tree3076118573d8b15afae3b467e2e5957b44d565ac /content/common
parentcc5bccd9d8a11965dd899ecf613361223413aed3 (diff)
downloadchromium_src-af3594e07f3b8e43c547d5bab900cd15b23b0208.zip
chromium_src-af3594e07f3b8e43c547d5bab900cd15b23b0208.tar.gz
chromium_src-af3594e07f3b8e43c547d5bab900cd15b23b0208.tar.bz2
Don't ignore {OMX,DXVA}VideoDecodeAccelerator::Initialize() failures.
Also fixed an out-of-date LOG message. BUG=none TEST=fallback from HW to SW decode works on non-h264 video again on cros/arm. Review URL: http://codereview.chromium.org/8956071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/gpu/media/gpu_video_decode_accelerator.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index c228c63..dc683c5 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -147,7 +147,8 @@ void GpuVideoDecodeAccelerator::Initialize(
stub_->decoder()->GetGLContext()->GetHandle());
#endif // OS_WIN
video_decode_accelerator_ = video_decoder;
- video_decode_accelerator_->Initialize(profile);
+ if (!video_decode_accelerator_->Initialize(profile))
+ NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
#else // Update RenderViewImpl::createMediaPlayer when adding clauses.
NOTIMPLEMENTED() << "HW video decode acceleration not available.";
NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);