drm_hwcomposer: Reorganize struct DrmHwcLayer
1. Move BlendMode, ColorSpace, SampleRange fields to the struct BufferInfo,
allowing extraction of the data from native_handle using Metadata@4 API.
Use it when data from HWC2 API can't be used (Currently it's a BlendMode
case for CLIENT layer)
2. Rename DrmHwcLayer to LayerData and move it to compositor/ directory.
(I was confused in the past because of similarity of names DrmHwcLayer
vs HwcLayer, so this step should meke it easier for newcomers to
understand the code)
3. Allow clonning of the LayerData to propagate it through the composition
pipeline. Thus LayerData can be used by both HwcLayer to track state
and by the compositor.
Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>
diff --git a/compositor/DrmKmsPlan.cpp b/compositor/DrmKmsPlan.cpp
index 966bd4e..6289b84 100644
--- a/compositor/DrmKmsPlan.cpp
+++ b/compositor/DrmKmsPlan.cpp
@@ -24,7 +24,7 @@
namespace android {
auto DrmKmsPlan::CreateDrmKmsPlan(DrmDisplayPipeline &pipe,
- std::vector<DrmHwcLayer> composition)
+ std::vector<LayerData> composition)
-> std::unique_ptr<DrmKmsPlan> {
auto plan = std::make_unique<DrmKmsPlan>();
diff --git a/compositor/DrmKmsPlan.h b/compositor/DrmKmsPlan.h
index 35e66e9..91f636e 100644
--- a/compositor/DrmKmsPlan.h
+++ b/compositor/DrmKmsPlan.h
@@ -20,7 +20,7 @@
#include <memory>
#include <vector>
-#include "drmhwcomposer.h"
+#include "LayerData.h"
namespace android {
@@ -28,7 +28,7 @@
struct DrmKmsPlan {
struct LayerToPlaneJoining {
- DrmHwcLayer layer;
+ LayerData layer;
std::shared_ptr<BindingOwner<DrmPlane>> plane;
int z_pos;
};
@@ -36,7 +36,7 @@
std::vector<LayerToPlaneJoining> plan;
static auto CreateDrmKmsPlan(DrmDisplayPipeline &pipe,
- std::vector<DrmHwcLayer> composition)
+ std::vector<LayerData> composition)
-> std::unique_ptr<DrmKmsPlan>;
};
diff --git a/compositor/LayerData.h b/compositor/LayerData.h
new file mode 100644
index 0000000..d04514d
--- /dev/null
+++ b/compositor/LayerData.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <hardware/hardware.h>
+#include <hardware/hwcomposer.h>
+
+#include <cmath>
+#include <cstdbool>
+#include <cstdint>
+#include <optional>
+#include <vector>
+
+#include "bufferinfo/BufferInfo.h"
+#include "drm/DrmFbImporter.h"
+#include "utils/UniqueFd.h"
+
+namespace android {
+
+class DrmFbIdHandle;
+
+enum LayerTransform : uint32_t {
+ kIdentity = 0,
+ kFlipH = 1 << 0,
+ kFlipV = 1 << 1,
+ kRotate90 = 1 << 2,
+ kRotate180 = 1 << 3,
+ kRotate270 = 1 << 4,
+};
+
+struct PresentInfo {
+ LayerTransform transform{};
+ uint16_t alpha = UINT16_MAX;
+ hwc_frect_t source_crop{};
+ hwc_rect_t display_frame{};
+
+ bool RequireScalingOrPhasing() const {
+ float src_width = source_crop.right - source_crop.left;
+ float src_height = source_crop.bottom - source_crop.top;
+
+ auto dest_width = float(display_frame.right - display_frame.left);
+ auto dest_height = float(display_frame.bottom - display_frame.top);
+
+ bool scaling = src_width != dest_width || src_height != dest_height;
+ bool phasing = (source_crop.left - std::floor(source_crop.left) != 0) ||
+ (source_crop.top - std::floor(source_crop.top) != 0);
+ return scaling || phasing;
+ }
+};
+
+struct LayerData {
+ auto Clone() {
+ LayerData clonned;
+ clonned.bi = bi;
+ clonned.fb = fb;
+ clonned.pi = pi;
+ clonned.acquire_fence = std::move(acquire_fence);
+ return clonned;
+ }
+
+ std::optional<BufferInfo> bi;
+ std::shared_ptr<DrmFbIdHandle> fb;
+ PresentInfo pi;
+ UniqueFd acquire_fence;
+};
+
+} // namespace android