diff options
Diffstat (limited to 'gralloc/QtiMapper.h')
-rw-r--r-- | gralloc/QtiMapper.h | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/gralloc/QtiMapper.h b/gralloc/QtiMapper.h index 7302e5e3..09e29c0b 100644 --- a/gralloc/QtiMapper.h +++ b/gralloc/QtiMapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -32,7 +32,7 @@ #include <hidl/MQDescriptor.h> #include <hidl/Status.h> -#include <vendor/qti/hardware/display/mapper/2.0/IQtiMapper.h> +#include <vendor/qti/hardware/display/mapper/3.0/IQtiMapper.h> #include "QtiMapperExtensions.h" #include "gr_buf_mgr.h" @@ -51,29 +51,27 @@ using ::android::hardware::hidl_string; using ::android::hardware::hidl_vec; using ::android::hardware::Return; using ::android::hardware::Void; -using ::android::hardware::graphics::common::V1_1::PixelFormat; -using ::android::hardware::graphics::mapper::V2_0::Error; -using ::android::hardware::graphics::mapper::V2_0::IMapper; -using ::android::hardware::graphics::mapper::V2_0::YCbCrLayout; +using ::android::hardware::graphics::common::V1_2::PixelFormat; +using ::android::hardware::graphics::mapper::V3_0::Error; +using ::android::hardware::graphics::mapper::V3_0::IMapper; +using ::android::hardware::graphics::mapper::V3_0::YCbCrLayout; using ::android::hidl::base::V1_0::DebugInfo; using ::android::hidl::base::V1_0::IBase; using gralloc::BufferManager; -using ::vendor::qti::hardware::display::mapper::V2_0::IQtiMapper; +using ::vendor::qti::hardware::display::mapper::V3_0::IQtiMapper; using ::vendor::qti::hardware::display::mapperextensions::V1_1::IQtiMapperExtensions; using ::vendor::qti::hardware::display::mapperextensions::V1_1::implementation::QtiMapperExtensions; -using IMapper_2_1 = android::hardware::graphics::mapper::V2_1::IMapper; -using BufferDescriptorInfo_2_0 = -android::hardware::graphics::mapper::V2_0::IMapper::BufferDescriptorInfo; -using BufferDescriptorInfo_2_1 = -android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo; -using IMapperBufferDescriptor = android::hardware::graphics::mapper::V2_0::BufferDescriptor; +using IMapper_3_0 = android::hardware::graphics::mapper::V3_0::IMapper; +using BufferDescriptorInfo_3_0 = + android::hardware::graphics::mapper::V3_0::IMapper::BufferDescriptorInfo; +using IMapperBufferDescriptor = android::hardware::graphics::mapper::V3_0::BufferDescriptor; class QtiMapper : public IQtiMapper { public: QtiMapper(); // Methods from ::android::hardware::graphics::mapper::V2_0::IMapper follow. - Return<void> createDescriptor(const BufferDescriptorInfo_2_0 &descriptor_info, + Return<void> createDescriptor(const BufferDescriptorInfo_3_0 &descriptor_info, createDescriptor_cb hidl_cb) override; Return<void> importBuffer(const hidl_handle &raw_handle, importBuffer_cb hidl_cb) override; Return<Error> freeBuffer(void *buffer) override; @@ -84,27 +82,27 @@ class QtiMapper : public IQtiMapper { Return<void> unlock(void *buffer, unlock_cb hidl_cb) override; // Methods from ::android::hardware::graphics::mapper::V2_1::IMapper follow. - Return<Error> validateBufferSize(void* buffer, - const BufferDescriptorInfo_2_1& descriptorInfo, + Return<Error> validateBufferSize(void *buffer, const BufferDescriptorInfo_3_0 &descriptorInfo, uint32_t stride) override; - Return<void> getTransportSize(void* buffer, IMapper_2_1::getTransportSize_cb hidl_cb) override; - Return<void> createDescriptor_2_1(const BufferDescriptorInfo_2_1& descriptorInfo, - createDescriptor_2_1_cb _hidl_cb) override; + Return<void> getTransportSize(void *buffer, IMapper_3_0::getTransportSize_cb hidl_cb) override; + + Return<void> isSupported(const BufferDescriptorInfo_3_0 &descriptor_info, + IMapper_3_0::isSupported_cb hidl_cb) override; Return<void> getMapperExtensions(getMapperExtensions_cb hidl_cb); sp<mapperextensions::V1_1::IQtiMapperExtensions> extensions_ = nullptr; private: BufferManager *buf_mgr_ = nullptr; - Error CreateDescriptor(const BufferDescriptorInfo_2_1& descriptor_info, - IMapperBufferDescriptor * descriptor); + Error CreateDescriptor(const BufferDescriptorInfo_3_0 &descriptor_info, + IMapperBufferDescriptor *descriptor); bool ValidDescriptor(const IMapper::BufferDescriptorInfo &bd); bool GetFenceFd(const hidl_handle &fence_handle, int *outFenceFd); void WaitFenceFd(int fence_fd); Error LockBuffer(void *buffer, uint64_t usage, const hidl_handle &acquire_fence); }; -extern "C" IMapper_2_1 *HIDL_FETCH_IMapper(const char *name); +extern "C" IMapper_3_0 *HIDL_FETCH_IMapper(const char *name); extern "C" IQtiMapper *HIDL_FETCH_IQtiMapper(const char *name); } // namespace implementation |