1
0
Fork 0

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>
This commit is contained in:
Roman Stratiienko 2022-02-21 14:53:58 +02:00
parent e9fbd8d626
commit 4b2cc484f9
19 changed files with 308 additions and 307 deletions

View file

@ -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>();

View file

@ -20,7 +20,7 @@
#include <memory>
#include <vector>
#include "drmhwcomposer.h"
#include "LayerData.h"
namespace android {
@ -28,7 +28,7 @@ class DrmDevice;
struct DrmKmsPlan {
struct LayerToPlaneJoining {
DrmHwcLayer layer;
LayerData layer;
std::shared_ptr<BindingOwner<DrmPlane>> plane;
int z_pos;
};
@ -36,7 +36,7 @@ struct DrmKmsPlan {
std::vector<LayerToPlaneJoining> plan;
static auto CreateDrmKmsPlan(DrmDisplayPipeline &pipe,
std::vector<DrmHwcLayer> composition)
std::vector<LayerData> composition)
-> std::unique_ptr<DrmKmsPlan>;
};

81
compositor/LayerData.h Normal file
View file

@ -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