summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorposciak@chromium.org <posciak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-11 22:07:51 +0000
committerposciak@chromium.org <posciak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-11 22:07:51 +0000
commit371f2face224bd51d0ba1e33b70e073f0b900b74 (patch)
treeb0bf86c3022bad9f39cbe71f43e142d8838625ce /media
parentf11d79c7c2f4a7665e5c4b839feacd9534d44ea2 (diff)
downloadchromium_src-371f2face224bd51d0ba1e33b70e073f0b900b74.zip
chromium_src-371f2face224bd51d0ba1e33b70e073f0b900b74.tar.gz
chromium_src-371f2face224bd51d0ba1e33b70e073f0b900b74.tar.bz2
Don't attempt HW video decode for videos with height >1088, instead of 1080.
1088 is the proper value for 16x16 macroblocks. BUG=chromium-os-partner:15145 TEST=none TBR=fischman@chromium.org Review URL: https://chromiumcodereview.appspot.com/11087084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/gpu_video_decoder.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
index c7909e4..08a1cf1 100644
--- a/media/filters/gpu_video_decoder.cc
+++ b/media/filters/gpu_video_decoder.cc
@@ -151,8 +151,9 @@ void GpuVideoDecoder::Initialize(const scoped_refptr<DemuxerStream>& stream,
}
// Only non-Windows, Ivy Bridge+ platforms can support more than 1920x1080.
+ // We test against 1088 to account for 16x16 macroblocks.
if (config.coded_size().width() > 1920 ||
- config.coded_size().height() > 1080) {
+ config.coded_size().height() > 1088) {
base::CPU cpu;
bool hw_large_video_support =
cpu.vendor_name() == "GenuineIntel" && cpu.model() >= 58;