diff options
| author | Midas Chien <midaschieh@google.com> | 2023-02-23 13:59:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-02-23 13:59:24 +0000 |
| commit | 6d24359dbab38ef643e6a2aa4964cd548ce3979e (patch) | |
| tree | a726dc66187d646a966987cf29465e6f5542be00 | |
| parent | 89cbf8568a01e3774d434721f81c743e64267729 (diff) | |
| parent | dd226ff35f5405359b0da8c589762687f7cc5903 (diff) | |
Merge "libhwc2.1: add dest info into checkSpecificRestriction" into tm-qpr-dev
| -rw-r--r-- | libhwc2.1/libdevice/ExynosLayer.cpp | 7 | ||||
| -rw-r--r-- | libhwc2.1/libresource/ExynosMPP.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libhwc2.1/libdevice/ExynosLayer.cpp b/libhwc2.1/libdevice/ExynosLayer.cpp index 17960e0..436f7a2 100644 --- a/libhwc2.1/libdevice/ExynosLayer.cpp +++ b/libhwc2.1/libdevice/ExynosLayer.cpp @@ -968,14 +968,13 @@ bool ExynosLayer::checkBtsCap(const uint32_t bts_refresh_rate) { if (mOtfMPP == nullptr) return true; exynos_image src_img; + exynos_image dst_img; setSrcExynosImage(&src_img); - if (mOtfMPP->checkSpecificRestriction(bts_refresh_rate, src_img)) { + setDstExynosImage(&dst_img); + if (mOtfMPP->checkSpecificRestriction(bts_refresh_rate, src_img, dst_img)) { return false; } - exynos_image dst_img; - setDstExynosImage(&dst_img); - const bool isPerpendicular = !!(src_img.transform & HAL_TRANSFORM_ROT_90); const uint32_t srcWidth = isPerpendicular ? src_img.h : src_img.w; const uint32_t srcHeight = isPerpendicular ? src_img.w : src_img.h; diff --git a/libhwc2.1/libresource/ExynosMPP.h b/libhwc2.1/libresource/ExynosMPP.h index 7c3097c..dd9bfd7 100644 --- a/libhwc2.1/libresource/ExynosMPP.h +++ b/libhwc2.1/libresource/ExynosMPP.h @@ -578,7 +578,8 @@ public: virtual bool isSupportedHStrideCrop(struct exynos_image &src); bool checkDownscaleCap(const float resolution, const float displayRatio_V) const; virtual bool checkSpecificRestriction(const uint32_t __unused refreshRate, - const struct exynos_image __unused &src) { + const struct exynos_image __unused &src, + const struct exynos_image __unused &dst) { return false; } virtual uint32_t getDownscaleRestriction(const struct exynos_image &src, |