Send AndroidOverlay routing token from WMPI to AVDA.

media/filters/gpu_video_decoder.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <list>
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/common/sync_token.h"
+#include "media/base/overlay_info.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"
 
 template <class T> class scoped_refptr;
 
 namespace base {
 class SharedMemory;
 }
@@ skipping 10 matching lines @@
 
 // GPU-accelerated video decoder implementation.  Relies on
 // AcceleratedVideoDecoderMsg_Decode and friends.  Can be created on any thread
 // but must be accessed and destroyed on GpuVideoAcceleratorFactories's
 // GetMessageLoop().
 class MEDIA_EXPORT GpuVideoDecoder
     : public VideoDecoder,
       public VideoDecodeAccelerator::Client {
  public:
   GpuVideoDecoder(GpuVideoAcceleratorFactories* factories,
-                  const RequestSurfaceCB& request_surface_cb,
+                  const RequestOverlayInfoCB& request_overlay_info_cb,
                   MediaLog* media_log);
 
   // VideoDecoder implementation.
   std::string GetDisplayName() const override;
   void Initialize(const VideoDecoderConfig& config,
                   bool low_delay,
                   CdmContext* cdm_context,
                   const InitCB& init_cb,
                   const OutputCB& output_cb) override;
   void Decode(const scoped_refptr<DecoderBuffer>& buffer,
@@ skipping 86 matching lines @@
   // |profile|, |coded_size|, and |is_encrypted|.
   bool IsProfileSupported(
       const VideoDecodeAccelerator::Capabilities& capabilities,
       VideoCodecProfile profile,
       const gfx::Size& coded_size,
       bool is_encrypted);
 
   // Assert the contract that this class is operated on the right thread.
   void DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent() const;
 
-  // Provided to the |request_surface_cb_| callback given during construction;
-  // sets or changes the output surface.
-  void OnSurfaceAvailable(int surface_id);
+  // Provided to the |request_overlay_info_cb_| callback given during
+  // construction.  Sets or changes the output surface.
+  void OnOverlayInfoAvailable(
+      int surface_id,
+      const base::Optional<base::UnguessableToken>& routing_token);
 
   // If the VDA supports external surfaces, we must wait for the surface before
   // completing initialization. This will be called by OnSurfaceAvailable() once
   // the surface is known or immediately by Initialize() if external surfaces
   // are unsupported.
-  void CompleteInitialization(int surface_id);
+  void CompleteInitialization(
+      int surface_id,
+      const base::Optional<base::UnguessableToken>& token);
 
   bool needs_bitstream_conversion_;
 
   GpuVideoAcceleratorFactories* factories_;
 
   // For requesting a suface to render to. If this is null the VDA will return
   // normal video frames and not render them to a surface.
-  RequestSurfaceCB request_surface_cb_;
+  RequestOverlayInfoCB request_overlay_info_cb_;
 
   MediaLog* media_log_;
 
   // Populated during Initialize() (on success) and unchanged until an error
   // occurs.
   std::unique_ptr<VideoDecodeAccelerator> vda_;
 
   // Whether |vda_->Initialize()| has been called. This is used to avoid
   // calling Initialize() again while a deferred initialization is in progress.
   bool vda_initialized_;
@@ skipping 78 matching lines @@
   // Bound to factories_->GetMessageLoop().
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<GpuVideoDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_