Chromium Code Reviews| Index: media/video/video_decode_accelerator.h |
| diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h |
| index 6fe0573fd0bbc24eb23506616c87ef40bdb19fa8..bbe0cd5cb392b881fac5043654c550eb96b22616 100644 |
| --- a/media/video/video_decode_accelerator.h |
| +++ b/media/video/video_decode_accelerator.h |
| @@ -17,6 +17,7 @@ |
| #include "media/base/bitstream_buffer.h" |
| #include "media/base/cdm_context.h" |
| #include "media/base/encryption_scheme.h" |
| +#include "media/base/overlay_info.h" |
| #include "media/base/surface_manager.h" |
| #include "media/base/video_decoder_config.h" |
| #include "media/video/picture.h" |
| @@ -152,6 +153,7 @@ class MEDIA_EXPORT VideoDecodeAccelerator { |
| // Whether the client supports deferred initialization. |
| bool is_deferred_initialization_allowed = false; |
| +#if 0 |
|
tguilbert
2017/05/24 19:14:54
Intentional?
liberato (no reviews please)
2017/05/24 21:21:07
nope, wanted to be sure that i didn't forget to up
|
| // An optional graphics surface that the VDA should render to. For setting |
| // an output SurfaceView on Android. It's only valid when not equal to |
| // |kNoSurfaceID|. |
| @@ -160,6 +162,11 @@ class MEDIA_EXPORT VideoDecodeAccelerator { |
| // An optional routing token for AndroidOverlay. |
| base::Optional<base::UnguessableToken> overlay_routing_token; |
| +#endif |
| + |
| + // Optional overlay info available at startup, rather than waiting for the |
| + // VDA to receive a callback. |
| + OverlayInfo overlay_info; |
| // Coded size of the video frame hint, subject to change. |
| gfx::Size initial_expected_coded_size = gfx::Size(320, 240); |
| @@ -315,9 +322,7 @@ class MEDIA_EXPORT VideoDecodeAccelerator { |
| // previously set surface in favor of an internally generated texture. |
| // |routing_token| is an optional AndroidOverlay routing token. At most one |
| // should be non-empty. |
| - virtual void SetSurface( |
| - int32_t surface_id, |
| - const base::Optional<base::UnguessableToken>& routing_token); |
| + virtual void SetOverlayInfo(const OverlayInfo& overlay_info); |
| // Destroys the decoder: all pending inputs are dropped immediately and the |
| // component is freed. This call may asynchornously free system resources, |