Merge M51: "Bump hardware decoding limits to 4k."

content/common/gpu/media/android_video_decode_accelerator.cc

Index: content/common/gpu/media/android_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc
index 5316dcc9367668578e4802a3715281dd1b7e214a..0b2178323d86b8bdefd22de6c243667343191630 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.cc
+++ b/content/common/gpu/media/android_video_decode_accelerator.cc
@@ -1405,7 +1405,7 @@ AndroidVideoDecodeAccelerator::GetCapabilities(
     SupportedProfile profile;
     profile.profile = media::VP8PROFILE_ANY;
     profile.min_resolution.SetSize(0, 0);
-    profile.max_resolution.SetSize(1920, 1088);
+    profile.max_resolution.SetSize(3840, 2160);
     // If we know MediaCodec will just create a software codec, prefer our
     // internal software decoder instead. It's more up to date and secured
     // within the renderer sandbox. However if the content is encrypted, we
@@ -1419,7 +1419,7 @@ AndroidVideoDecodeAccelerator::GetCapabilities(
   if (media::MediaCodecUtil::IsVp9DecoderAvailable()) {
     SupportedProfile profile;
     profile.min_resolution.SetSize(0, 0);
-    profile.max_resolution.SetSize(1920, 1088);
+    profile.max_resolution.SetSize(3840, 2160);
     // If we know MediaCodec will just create a software codec, prefer our
     // internal software decoder instead. It's more up to date and secured
     // within the renderer sandbox. However if the content is encrypted, we