Serialize usage of SurfaceView between AVDA instances.

media/gpu/android_video_decode_accelerator.h

 // Copyright (c) 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_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 192 matching lines @@
     gfx::Size initial_expected_coded_size_;
 
    protected:
     friend class base::RefCountedThreadSafe<CodecConfig>;
     virtual ~CodecConfig();
 
    private:
     DISALLOW_COPY_AND_ASSIGN(CodecConfig);
   };
 
+  // Callback that is called when the SurfaceView becomes available, if it's
+  // not during Initialize.  |success| is true if it is now available, false
+  // if initialization should stop.
+  void OnSurfaceAvailable(bool success);
+
+  // Finish initialization of the strategy.  This is to be called when the
+  // SurfaceView in |surface_id_|, if any, is no longer busy.  It will return
+  // false on failure, and true if initialization was successful.  This includes
+  // synchronous and asynchronous init; the AVDA might not yet have a codec on
+  // success, but async init will at least be in progress.
+  bool InitializeStrategy();

[watk, 2016/05/18 20:38:18]

Header order doesn't match cc order

[liberato (no reviews please), 2016/05/18 21:13:13]

not sure that i follow -- OnSurfaceAvailable preceeds InitializeStrategy.  the
rest of them are out of order, but i kept the new ones close to ::Initialize.

couldn't put them close in the header since ::Initialize is inherited.

[watk, 2016/05/18 21:21:14]

Sorry, I just noticed that InitializeStrategy is followed by DoIOTask so I
thought you inserted them at the wrong place. But you did the right thing and
the order was already weird.

+
   // A part of destruction process that is sometimes postponed after the drain.
   void ActualDestroy();
 
   // Configures |media_codec_| with the given codec parameters from the client.
   // This configuration will (probably) not be complete before this call
   // returns.  Multiple calls before completion will be ignored.  |state_|
   // must be NO_ERROR or WAITING_FOR_CODEC.  Note that, once you call this,
   // you should be careful to avoid modifying members of |codec_config_| until
   // |state_| is no longer WAITING_FOR_CODEC.
   void ConfigureMediaCodecAsynchronously();
@@ skipping 33 matching lines @@
   bool DequeueOutput();
 
   // Requests picture buffers from the client.
   void RequestPictureBuffers();
 
   // Decode the content in the |bitstream_buffer|. Note that a
   // |bitstream_buffer| of id as -1 indicates a flush command.
   void DecodeBuffer(const media::BitstreamBuffer& bitstream_buffer);
 
   // Called during Initialize() for encrypted streams to set up the CDM.
-  void InitializeCdm(int cdm_id);
+  void InitializeCdm();
 
   // Called after the CDM obtains a MediaCrypto object.
   void OnMediaCryptoReady(
       media::MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto,
       bool needs_protected_surface);
 
   // Called when a new key is added to the CDM.
   void OnKeyAdded();
 
   // Notifies the client of the result of deferred initialization.
@@ skipping 141 matching lines @@
   // from being sent after a reset.
   int error_sequence_token_;
 
   // PostError will defer sending an error if and only if this is true.
   bool defer_errors_;
 
   // True if and only if VDA initialization is deferred, and we have not yet
   // called NotifyInitializationComplete.
   bool deferred_initialization_pending_;
 
+  // Cdm id that we will use in InitializeCdm().
+  int cdm_id_;
+
   int surface_id_;
 
   OnDestroyingSurfaceCallback on_destroying_surface_cb_;
 
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_;
 
   friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_