Commit bd90ddd4 authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Revert "Add 4K+ portrait resolutions for the H264 and VP9 DXVA decoders."

This reverts commit 2d7795fe.

Reason for revert: DXVA resolution checks are for explicit w:h pairs, adding portrait prevents landscape from working... This needs to be reworked to return multiple supported profiles.

Original change's description:
> Add 4K+ portrait resolutions for the H264 and VP9 DXVA decoders.
> 
> H264 is most affected since VP9 gets 4K portrait support by virtue
> of supporting 8K decoding. This cl also adds 8K portrait mode
> support for VP9.
> 
> BUG=806568
> TEST=manually verified video in bug gets GpuVideoDecoder.
> 
> Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
> Change-Id: I4c622e3d3e54c43f85c6d3af0d7624f66a0639b6
> Reviewed-on: https://chromium-review.googlesource.com/891670
> Reviewed-by: Frank Liberato <liberato@chromium.org>
> Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#532710}

TBR=dalecurtis@chromium.org,liberato@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 806568
Change-Id: I44fe795c02660f0aa8149bf1b9107a54eeb06923
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/900142Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534172}
parent c4653a99
......@@ -1388,14 +1388,14 @@ gfx::Size DXVAVideoDecodeAccelerator::GetMaxResolution(
static const gfx::Size kCachedH264Resolution = GetMaxResolutionForGUIDs(
kDefaultMax, {DXVA2_ModeH264_E, DXVA2_Intel_ModeH264_E},
{gfx::Size(2560, 1440), gfx::Size(3840, 2160), gfx::Size(4096, 2160),
gfx::Size(4096, 2304), gfx::Size(2160, 3840)});
gfx::Size(4096, 2304)});
return kCachedH264Resolution;
}
// Despite the name this is the GUID for VP8/VP9.
static const gfx::Size kCachedVPXResolution = GetMaxResolutionForGUIDs(
gfx::Size(4096, 2160), {D3D11_DECODER_PROFILE_VP9_VLD_PROFILE0},
{gfx::Size(4096, 2304), gfx::Size(7680, 4320), gfx::Size(4320, 7680)});
{gfx::Size(4096, 2304), gfx::Size(7680, 4320)});
return kCachedVPXResolution;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment