Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/gpu/android_video_decode_accelerator.h" | 5 #include "media/gpu/android_video_decode_accelerator.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1443 SupportedProfile profile; | 1443 SupportedProfile profile; |
| 1444 profile.profile = supported_profile; | 1444 profile.profile = supported_profile; |
| 1445 profile.min_resolution.SetSize(0, 0); | 1445 profile.min_resolution.SetSize(0, 0); |
| 1446 // Advertise support for 4k and let the MediaCodec fail when decoding if it | 1446 // Advertise support for 4k and let the MediaCodec fail when decoding if it |
| 1447 // doesn't support the resolution. It's assumed that consumers won't have | 1447 // doesn't support the resolution. It's assumed that consumers won't have |
| 1448 // software fallback for H264 on Android anyway. | 1448 // software fallback for H264 on Android anyway. |
| 1449 profile.max_resolution.SetSize(3840, 2160); | 1449 profile.max_resolution.SetSize(3840, 2160); |
| 1450 profiles.push_back(profile); | 1450 profiles.push_back(profile); |
| 1451 } | 1451 } |
| 1452 | 1452 |
| 1453 capabilities.flags |= media::VideoDecodeAccelerator::Capabilities:: | |
|
liberato (no reviews please)
2016/05/03 21:20:12
s/|=/=
watk
2016/05/03 21:53:12
Done. I also did a sneaky change to move "profile"
| |
| 1454 SUPPORTS_DEFERRED_INITIALIZATION; | |
| 1453 if (UseDeferredRenderingStrategy(gpu_preferences)) { | 1455 if (UseDeferredRenderingStrategy(gpu_preferences)) { |
| 1454 capabilities.flags = media::VideoDecodeAccelerator::Capabilities:: | 1456 capabilities.flags |= media::VideoDecodeAccelerator::Capabilities:: |
| 1455 NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE | | 1457 NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE; |
| 1456 media::VideoDecodeAccelerator::Capabilities:: | |
| 1457 SUPPORTS_DEFERRED_INITIALIZATION; | |
| 1458 if (media::MediaCodecUtil::IsSurfaceViewOutputSupported()) { | 1458 if (media::MediaCodecUtil::IsSurfaceViewOutputSupported()) { |
| 1459 capabilities.flags |= media::VideoDecodeAccelerator::Capabilities:: | 1459 capabilities.flags |= media::VideoDecodeAccelerator::Capabilities:: |
| 1460 SUPPORTS_EXTERNAL_OUTPUT_SURFACE; | 1460 SUPPORTS_EXTERNAL_OUTPUT_SURFACE; |
| 1461 } | 1461 } |
| 1462 } | 1462 } |
| 1463 | 1463 |
| 1464 return capabilities; | 1464 return capabilities; |
| 1465 } | 1465 } |
| 1466 | 1466 |
| 1467 } // namespace media | 1467 } // namespace media |
| OLD | NEW |