Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: ui/ozone/public/overlay_candidates_ozone.h

Issue 1110813002: Fix assert in GetOverlayRect when transforming video with Ozone overlay (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reject non-integer rects in Ozone GBM validator Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_ 5 #ifndef UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_
6 #define UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_ 6 #define UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "ui/gfx/geometry/rect_f.h" 11 #include "ui/gfx/geometry/rect_f.h"
12 #include "ui/ozone/ozone_base_export.h" 12 #include "ui/ozone/ozone_base_export.h"
13 #include "ui/ozone/public/surface_factory_ozone.h" 13 #include "ui/ozone/public/surface_factory_ozone.h"
14 14
15 namespace ui { 15 namespace ui {
16 16
17 // This class can be used to answer questions about possible overlay 17 // This class can be used to answer questions about possible overlay
18 // configurations for a particular output device. We get an instance of this 18 // configurations for a particular output device. We get an instance of this
19 // class from SurfaceFactoryOzone given an AcceleratedWidget. 19 // class from SurfaceFactoryOzone given an AcceleratedWidget.
20 class OZONE_BASE_EXPORT OverlayCandidatesOzone { 20 class OZONE_BASE_EXPORT OverlayCandidatesOzone {
21 public: 21 public:
22 struct OverlaySurfaceCandidate { 22 struct OverlaySurfaceCandidate {
23 OverlaySurfaceCandidate(); 23 OverlaySurfaceCandidate();
24 ~OverlaySurfaceCandidate(); 24 ~OverlaySurfaceCandidate();
25 25
26 // Transformation to apply to layer during composition. 26 // Transformation to apply to layer during composition.
27 gfx::OverlayTransform transform; 27 gfx::OverlayTransform transform;
28 // Format of the buffer to composite. 28 // Format of the buffer to composite.
29 SurfaceFactoryOzone::BufferFormat format; 29 SurfaceFactoryOzone::BufferFormat format;
30 // Rect on the display to position the overlay to. 30 // Rect on the display to position the overlay to. Input rectangle may
31 gfx::Rect display_rect; 31 // not have integer coordinates, but when accepting for overlay, must
32 // be modified by CheckOverlaySupport to output integer values.
33 gfx::RectF display_rect;
32 // Crop within the buffer to be placed inside |display_rect|. 34 // Crop within the buffer to be placed inside |display_rect|.
33 gfx::RectF crop_rect; 35 gfx::RectF crop_rect;
34 // Stacking order of the overlay plane relative to the main surface, 36 // Stacking order of the overlay plane relative to the main surface,
35 // which is 0. Signed to allow for "underlays". 37 // which is 0. Signed to allow for "underlays".
36 int plane_z_order; 38 int plane_z_order;
37 39
38 // To be modified by the implementer if this candidate can go into 40 // To be modified by the implementer if this candidate can go into
39 // an overlay. 41 // an overlay.
40 bool overlay_handled; 42 bool overlay_handled;
41 }; 43 };
42 44
43 typedef std::vector<OverlaySurfaceCandidate> OverlaySurfaceCandidateList; 45 typedef std::vector<OverlaySurfaceCandidate> OverlaySurfaceCandidateList;
44 46
45 // A list of possible overlay candidates is presented to this function. 47 // A list of possible overlay candidates is presented to this function.
46 // The expected result is that those candidates that can be in a separate 48 // The expected result is that those candidates that can be in a separate
47 // plane are marked with |overlay_handled| set to true, otherwise they are 49 // plane are marked with |overlay_handled| set to true, otherwise they are
48 // to be tranditionally composited. 50 // to be traditionally composited. When setting |overlay_handled| to true,
51 // the implementation must also snap |display_rect| to integer coordinates
52 // if necessary.
49 virtual void CheckOverlaySupport(OverlaySurfaceCandidateList* surfaces); 53 virtual void CheckOverlaySupport(OverlaySurfaceCandidateList* surfaces);
50 54
51 virtual ~OverlayCandidatesOzone(); 55 virtual ~OverlayCandidatesOzone();
52 }; 56 };
53 57
54 } // namespace ui 58 } // namespace ui
55 59
56 #endif // UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_ 60 #endif // UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_
OLDNEW
« ui/ozone/platform/drm/gbm_surface_factory.cc ('K') | « ui/ozone/platform/drm/gbm_surface_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698