Use MediaCodec.setOutputSurface() for fullscreen transitions on M.

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>
 
@@ skipping 40 matching lines @@
                   const RequestSurfaceCB& request_surface_cb,
                   scoped_refptr<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 CompleteInitialization(int cdm_id, int surface_id);
   void Decode(const scoped_refptr<DecoderBuffer>& buffer,
               const DecodeCB& decode_cb) override;
   void Reset(const base::Closure& closure) override;
   bool NeedsBitstreamConversion() const override;
   bool CanReadWithoutStalling() const override;
   int GetMaxDecodeRequests() const override;
 
   // VideoDecodeAccelerator::Client implementation.
   void NotifyInitializationComplete(bool success) override;
   void ProvidePictureBuffers(uint32_t count,
@@ skipping 77 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);
+
+  // 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();
+
   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_;
 
   scoped_refptr<MediaLog> media_log_;
 
@@ skipping 67 matching lines @@
   bool needs_all_picture_buffers_to_decode_;
 
   // If true, then the VDA supports deferred initialization via
   // NotifyInitializationComplete.  Otherwise, it will return initialization
   // status synchronously from VDA::Initialize.
   bool supports_deferred_initialization_;
 
   // This flag translates to COPY_REQUIRED flag for each frame.
   bool requires_texture_copy_;
 
+  // Set during Initialize(); given to the VDA for purposes for handling
+  // encrypted content.
+  int cdm_id_;
+
   // 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_