Ozone: Dont hardcode format to YUV when using Overlay Composition.

ui/ozone/platform/drm/host/drm_overlay_candidates_host.h

Index: ui/ozone/platform/drm/host/drm_overlay_candidates_host.h
diff --git a/ui/ozone/platform/drm/host/drm_overlay_candidates_host.h b/ui/ozone/platform/drm/host/drm_overlay_candidates_host.h
index ea272dd25205ae0a7cf086d9d329f404c3b81124..0573f861921f7e2739e9e70ced4f552df43c467a 100644
--- a/ui/ozone/platform/drm/host/drm_overlay_candidates_host.h
+++ b/ui/ozone/platform/drm/host/drm_overlay_candidates_host.h
@@ -54,14 +54,6 @@ class DrmOverlayCandidatesHost : public OverlayCandidatesOzone,
   void ResetCache();
 
  private:
-  struct HardwareDisplayPlaneProxy {
-    HardwareDisplayPlaneProxy(uint32_t id);
-    ~HardwareDisplayPlaneProxy();
-
-    bool in_use = false;
-    uint32_t plane_id;
-  };
-
   struct OverlayCompare {
     bool operator()(const OverlayCheck_Params& l,
                     const OverlayCheck_Params& r) const;
@@ -72,34 +64,27 @@ class DrmOverlayCandidatesHost : public OverlayCandidatesOzone,
     typedef std::map<KeyType, ValueType, OverlayCompare> Type;
   };
 
-  void SendRequest(const std::vector<OverlayCheck_Params>& list);
+  void SendRequest(const std::vector<OverlayCheck_Params>& current_list,
+                   const std::vector<OverlayCheck_Params>& new_list);
   void OnOverlayResult(bool* handled,
                        gfx::AcceleratedWidget widget,
                        const std::vector<OverlayCheck_Params>& params);
   bool CanHandleCandidate(const OverlaySurfaceCandidate& candidate) const;
   uint32_t CalculateCandidateWeight(
       const OverlaySurfaceCandidate& candidate) const;
-  void ValidateCandidates(OverlaySurfaceCandidateList* candidates);
+  void ValidateCandidates(const OverlaySurfaceCandidateList& candidates);
 
   DrmGpuPlatformSupportHost* platform_support_;  // Not owned.
   DrmWindowHost* window_;                        // Not owned.
 
-  // List of all OverlayCheck_Params which have been validated in GPU side. If
-  // this value is true, it means the particular param is compatible and
-  // corresponding candidate can be promoted to use Hardware Overlays.
+  // List of all OverlayCheck_Params which have been validated in GPU side.
   base::MRUCacheBase<OverlayCheck_Params,
-                     bool,
-                     base::MRUCacheNullDeletor<bool>,
+                     OverlayCheck_Params::State,
+                     base::MRUCacheNullDeletor<OverlayCheck_Params::State>,
                      OverlayMap> cache_;
-  // List of all OverlayCheck_Params currently in use by various candidates. If
-  // the value is true, it means the correspnding candidate has been promoted to
-  // use overlay.
-  typedef std::map<OverlayCheck_Params, bool, OverlayCompare> CompatibleParams;
-  CompatibleParams in_use_compatible_params_;
-  // Used to get best possible approximation of plane usage in GPU side. We use
-  // this to make sure we don't handle more candidates than what we can support
-  // in GPU side.
-  ScopedVector<HardwareDisplayPlaneProxy> hardware_plane_proxy_;
+
+  // List of all compatible OverlayCheck_Params currently in use.
+  std::vector<OverlayCheck_Params> in_use_params_;

[dnicoara, 2015/11/23 19:22:54]

I'm not sure that this is really needed or that it's description is correct.

Just because we've checked a configuration doesn't mean that it is in use. In
particular I can see CC querying and caching some valid configurations and just
switching between them as needed without querying again. For example it could be
that it overlayed a video. When the video finishes it would just go back to the
1 plane configuration without querying again.

Could we do without this?

 
   DISALLOW_COPY_AND_ASSIGN(DrmOverlayCandidatesHost);
 };