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

media/blink/webmediaplayer_impl.h

 // Copyright 2013 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_BLINK_WEBMEDIAPLAYER_IMPL_H_
 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 262 matching lines @@
   void DataSourceInitialized(bool success);
 
   // Called when the data source is downloading or paused.
   void NotifyDownloading(bool is_downloading);
 
   // Called by SurfaceManager when a surface is created.
   void OnSurfaceCreated(int surface_id);
 
   // Called by GpuVideoDecoder on Android to request a surface to render to (if
   // necessary).
-  void OnSurfaceRequested(const SurfaceCreatedCB& surface_created_cb);
+  void OnSurfaceRequested(bool decoder_requires_restart_for_overlay,
+                          const SurfaceCreatedCB& surface_created_cb);
 
   // Creates a Renderer via the |renderer_factory_|.
   std::unique_ptr<Renderer> CreateRenderer();
 
   // Finishes starting the pipeline due to a call to load().
   void StartPipeline();
 
   // Helpers that set the network/ready state and notifies the client if
   // they've changed.
   void SetNetworkState(blink::WebMediaPlayer::NetworkState state);
@@ skipping 225 matching lines @@
   SurfaceManager* surface_manager_;
 
   // For canceling ongoing surface creation requests when exiting fullscreen.
   base::CancelableCallback<void(int)> surface_created_cb_;
 
   // The current overlay surface id. Populated while in fullscreen once the
   // surface is created.
   int overlay_surface_id_;
 
   // If a surface is requested before it's finished being created, the request
-  // is saved and satisfied once the surface is available.
-  SurfaceCreatedCB pending_surface_request_cb_;
+  // is saved and satisfied once the surface is available. If the decoder does
+  // not require restart to change surfaces, this is callback is kept until
+  // cleared by the decoder.
+  SurfaceCreatedCB set_surface_cb_;
 
   // Force to use SurfaceView instead of SurfaceTexture on Android.
   bool force_video_overlays_;
 
   // Prevent use of SurfaceView on Android. (Ignored when
   // |force_video_overlays_| is true.)
   bool disable_fullscreen_video_overlays_;
 
   // Suppresses calls to OnPipelineError() after destruction / shutdown has been
   // started; prevents us from spuriously logging errors that are transient or
@@ skipping 34 matching lines @@
 
   // Whether the player is currently in autoplay muted state.
   bool autoplay_muted_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_