| Index: media/filters/gpu_video_decoder.h
|
| diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h
|
| index 3223552b3ab09066fa1cc5ed46d4df9379e44b98..e133b6155c04754a5a78e5d1e404af30cac29c92 100644
|
| --- a/media/filters/gpu_video_decoder.h
|
| +++ b/media/filters/gpu_video_decoder.h
|
| @@ -17,6 +17,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "media/base/pipeline_status.h"
|
| +#include "media/base/surface_manager.h"
|
| #include "media/base/video_decoder.h"
|
| #include "media/video/video_decode_accelerator.h"
|
|
|
| @@ -45,7 +46,8 @@ class MEDIA_EXPORT GpuVideoDecoder
|
| : public VideoDecoder,
|
| public VideoDecodeAccelerator::Client {
|
| public:
|
| - explicit GpuVideoDecoder(GpuVideoAcceleratorFactories* factories);
|
| + explicit GpuVideoDecoder(GpuVideoAcceleratorFactories* factories,
|
| + const RequestSurfaceCB& request_surface_cb);
|
|
|
| // VideoDecoder implementation.
|
| std::string GetDisplayName() const override;
|
| @@ -54,6 +56,7 @@ class MEDIA_EXPORT GpuVideoDecoder
|
| const SetCdmReadyCB& set_cdm_ready_cb,
|
| const InitCB& init_cb,
|
| const OutputCB& output_cb) override;
|
| + void CompleteInitialization(int surface_id);
|
| void Decode(const scoped_refptr<DecoderBuffer>& buffer,
|
| const DecodeCB& decode_cb) override;
|
| void Reset(const base::Closure& closure) override;
|
| @@ -171,6 +174,8 @@ class MEDIA_EXPORT GpuVideoDecoder
|
|
|
| VideoDecoderConfig config_;
|
|
|
| + RequestSurfaceCB request_surface_cb_;
|
| +
|
| // Callback to request/cancel CDM ready notification.
|
| SetCdmReadyCB set_cdm_ready_cb_;
|
| CdmAttachedCB cdm_attached_cb_;
|
|
|