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 b818a05503db22fbdbbadd86d48e31dfee384176..569fc744de7d7987fb62ca01b8ea88911ef8d31e 100644 |
| --- a/media/video/video_decode_accelerator.h |
| +++ b/media/video/video_decode_accelerator.h |
| @@ -106,8 +106,6 @@ class MEDIA_EXPORT VideoDecodeAccelerator { |
| // Config structure contains parameters required for the VDA initialization. |
| struct MEDIA_EXPORT Config { |
| - enum { kNoSurfaceID = SurfaceManager::kNoSurfaceID }; |
| - |
| // Specifies the allocation and handling mode for output PictureBuffers. |
| // When set to ALLOCATE, the VDA is expected to allocate backing memory |
| // for PictureBuffers at the time of AssignPictureBuffers() call. |
| @@ -143,11 +141,6 @@ class MEDIA_EXPORT VideoDecodeAccelerator { |
| // Whether the client supports deferred initialization. |
| bool is_deferred_initialization_allowed = false; |
| - // 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|. |
| - int surface_id = kNoSurfaceID; |
| - |
| // Coded size of the video frame hint, subject to change. |
| gfx::Size initial_expected_coded_size = gfx::Size(320, 240); |
| @@ -291,6 +284,11 @@ class MEDIA_EXPORT VideoDecodeAccelerator { |
| // "seek". |
| virtual void Reset() = 0; |
| + // An optional graphics surface that the VDA should render to. For setting |
| + // an output SurfaceView on Android. Passing |kNoSurfaceID| will clear any |
| + // previosuly set surface in favor of an internally generated texture. |
|
watk
2016/11/08 22:59:04
*previously
DaleCurtis
2016/11/08 23:50:11
Done.
|
| + virtual void SetSurface(int32_t surface_id); |
| + |
| // Destroys the decoder: all pending inputs are dropped immediately and the |
| // component is freed. This call may asynchornously free system resources, |
| // but its client-visible effects are synchronous. After this method returns |