Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c1238df authored by John Reck's avatar John Reck
Browse files

Remove unused code not implemented in gralloc5 

Fixes: 261857910
Test: make
Change-Id: If567ea91a9881c18f2d068ab1e0c9a37969d6a8a
parent 2e33fcee

libs/ui/Gralloc4.cpp

+0 −156
Original line number Original line Diff line number Diff line
@@ -766,162 +766,6 @@ status_t Gralloc4Mapper::setSmpte2094_10(buffer_handle_t bufferHandle, 
               gralloc4::encodeSmpte2094_10);

               gralloc4::encodeSmpte2094_10);

}

}





template <class T>

status_t Gralloc4Mapper::getDefault(uint32_t width, uint32_t height, PixelFormat format,

                                    uint32_t layerCount, uint64_t usage,

                                    const MetadataType& metadataType,

                                    DecodeFunction<T> decodeFunction, T* outMetadata) const {

    if (!outMetadata) {

        return BAD_VALUE;

    }



    IMapper::BufferDescriptorInfo descriptorInfo;

    if (auto error = sBufferDescriptorInfo("getDefault", width, height, format, layerCount, usage,

                                           &descriptorInfo) != OK) {

        return error;

    }



    hidl_vec<uint8_t> vec;

    Error error;

    auto ret = mMapper->getFromBufferDescriptorInfo(descriptorInfo, metadataType,

                                                    [&](const auto& tmpError,

                                                        const hidl_vec<uint8_t>& tmpVec) {

                                                        error = tmpError;

                                                        vec = tmpVec;

                                                    });



    if (!ret.isOk()) {

        error = kTransactionError;

    }



    if (error != Error::NONE) {

        ALOGE("getDefault(%s, %" PRIu64 ", ...) failed with %d", metadataType.name.c_str(),

              metadataType.value, error);

        return static_cast<status_t>(error);

    }



    return decodeFunction(vec, outMetadata);

}



status_t Gralloc4Mapper::getDefaultPixelFormatFourCC(uint32_t width, uint32_t height,

                                                     PixelFormat format, uint32_t layerCount,

                                                     uint64_t usage,

                                                     uint32_t* outPixelFormatFourCC) const {

    return getDefault(width, height, format, layerCount, usage,

                      gralloc4::MetadataType_PixelFormatFourCC, gralloc4::decodePixelFormatFourCC,

                      outPixelFormatFourCC);

}



status_t Gralloc4Mapper::getDefaultPixelFormatModifier(uint32_t width, uint32_t height,

                                                       PixelFormat format, uint32_t layerCount,

                                                       uint64_t usage,

                                                       uint64_t* outPixelFormatModifier) const {

    return getDefault(width, height, format, layerCount, usage,

                      gralloc4::MetadataType_PixelFormatModifier,

                      gralloc4::decodePixelFormatModifier, outPixelFormatModifier);

}



status_t Gralloc4Mapper::getDefaultAllocationSize(uint32_t width, uint32_t height,

                                                  PixelFormat format, uint32_t layerCount,

                                                  uint64_t usage,

                                                  uint64_t* outAllocationSize) const {

    return getDefault(width, height, format, layerCount, usage,

                      gralloc4::MetadataType_AllocationSize, gralloc4::decodeAllocationSize,

                      outAllocationSize);

}



status_t Gralloc4Mapper::getDefaultProtectedContent(uint32_t width, uint32_t height,

                                                    PixelFormat format, uint32_t layerCount,

                                                    uint64_t usage,

                                                    uint64_t* outProtectedContent) const {

    return getDefault(width, height, format, layerCount, usage,

                      gralloc4::MetadataType_ProtectedContent, gralloc4::decodeProtectedContent,

                      outProtectedContent);

}



status_t Gralloc4Mapper::getDefaultCompression(uint32_t width, uint32_t height, PixelFormat format,

                                               uint32_t layerCount, uint64_t usage,

                                               ExtendableType* outCompression) const {

    return getDefault(width, height, format, layerCount, usage, gralloc4::MetadataType_Compression,

                      gralloc4::decodeCompression, outCompression);

}



status_t Gralloc4Mapper::getDefaultCompression(uint32_t width, uint32_t height, PixelFormat format,

                                               uint32_t layerCount, uint64_t usage,

                                               ui::Compression* outCompression) const {

    if (!outCompression) {

        return BAD_VALUE;

    }

    ExtendableType compression;

    status_t error = getDefaultCompression(width, height, format, layerCount, usage, &compression);

    if (error) {

        return error;

    }

    if (!gralloc4::isStandardCompression(compression)) {

        return BAD_TYPE;

    }

    *outCompression = gralloc4::getStandardCompressionValue(compression);

    return NO_ERROR;

}



status_t Gralloc4Mapper::getDefaultInterlaced(uint32_t width, uint32_t height, PixelFormat format,

                                              uint32_t layerCount, uint64_t usage,

                                              ExtendableType* outInterlaced) const {

    return getDefault(width, height, format, layerCount, usage, gralloc4::MetadataType_Interlaced,

                      gralloc4::decodeInterlaced, outInterlaced);

}



status_t Gralloc4Mapper::getDefaultInterlaced(uint32_t width, uint32_t height, PixelFormat format,

                                              uint32_t layerCount, uint64_t usage,

                                              ui::Interlaced* outInterlaced) const {

    if (!outInterlaced) {

        return BAD_VALUE;

    }

    ExtendableType interlaced;

    status_t error = getDefaultInterlaced(width, height, format, layerCount, usage, &interlaced);

    if (error) {

        return error;

    }

    if (!gralloc4::isStandardInterlaced(interlaced)) {

        return BAD_TYPE;

    }

    *outInterlaced = gralloc4::getStandardInterlacedValue(interlaced);

    return NO_ERROR;

}



status_t Gralloc4Mapper::getDefaultChromaSiting(uint32_t width, uint32_t height, PixelFormat format,

                                                uint32_t layerCount, uint64_t usage,

                                                ExtendableType* outChromaSiting) const {

    return getDefault(width, height, format, layerCount, usage, gralloc4::MetadataType_ChromaSiting,

                      gralloc4::decodeChromaSiting, outChromaSiting);

}



status_t Gralloc4Mapper::getDefaultChromaSiting(uint32_t width, uint32_t height, PixelFormat format,

                                                uint32_t layerCount, uint64_t usage,

                                                ui::ChromaSiting* outChromaSiting) const {

    if (!outChromaSiting) {

        return BAD_VALUE;

    }

    ExtendableType chromaSiting;

    status_t error =

            getDefaultChromaSiting(width, height, format, layerCount, usage, &chromaSiting);

    if (error) {

        return error;

    }

    if (!gralloc4::isStandardChromaSiting(chromaSiting)) {

        return BAD_TYPE;

    }

    *outChromaSiting = gralloc4::getStandardChromaSitingValue(chromaSiting);

    return NO_ERROR;

}



status_t Gralloc4Mapper::getDefaultPlaneLayouts(

        uint32_t width, uint32_t height, PixelFormat format, uint32_t layerCount, uint64_t usage,

        std::vector<ui::PlaneLayout>* outPlaneLayouts) const {

    return getDefault(width, height, format, layerCount, usage, gralloc4::MetadataType_PlaneLayouts,

                      gralloc4::decodePlaneLayouts, outPlaneLayouts);

}



std::vector<MetadataTypeDescription> Gralloc4Mapper::listSupportedMetadataTypes() const {

std::vector<MetadataTypeDescription> Gralloc4Mapper::listSupportedMetadataTypes() const {

    hidl_vec<MetadataTypeDescription> descriptions;

    hidl_vec<MetadataTypeDescription> descriptions;

    Error error;

    Error error;

libs/ui/Gralloc5.cpp

+0 −69
Original line number Original line Diff line number Diff line
@@ -831,73 +831,4 @@ status_t Gralloc5Mapper::setSmpte2094_10(buffer_handle_t bufferHandle, 
                                                                   smpte2094_10);

                                                                   smpte2094_10);

}

}





status_t Gralloc5Mapper::getDefaultPixelFormatFourCC(uint32_t, uint32_t, PixelFormat, uint32_t,

                                                     uint64_t, uint32_t *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultPixelFormatModifier(uint32_t, uint32_t, PixelFormat, uint32_t,

                                                       uint64_t, uint64_t *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultAllocationSize(uint32_t, uint32_t, PixelFormat, uint32_t,

                                                  uint64_t, uint64_t *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultProtectedContent(uint32_t, uint32_t, PixelFormat, uint32_t,

                                                    uint64_t, uint64_t *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultCompression(

        uint32_t, uint32_t, PixelFormat, uint32_t, uint64_t,

        aidl::android::hardware::graphics::common::ExtendableType *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultCompression(uint32_t, uint32_t, PixelFormat, uint32_t, uint64_t,

                                               ui::Compression *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultInterlaced(

        uint32_t, uint32_t, PixelFormat, uint32_t, uint64_t,

        aidl::android::hardware::graphics::common::ExtendableType *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultInterlaced(uint32_t, uint32_t, PixelFormat, uint32_t, uint64_t,

                                              ui::Interlaced *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultChromaSiting(

        uint32_t, uint32_t, PixelFormat, uint32_t, uint64_t,

        aidl::android::hardware::graphics::common::ExtendableType *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultChromaSiting(uint32_t, uint32_t, PixelFormat, uint32_t, uint64_t,

                                                ui::ChromaSiting *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



status_t Gralloc5Mapper::getDefaultPlaneLayouts(uint32_t, uint32_t, PixelFormat, uint32_t, uint64_t,

                                                std::vector<ui::PlaneLayout> *) const {

    // TODO(b/261857910): Remove

    return UNKNOWN_TRANSACTION;

}



} // namespace android
 
} // namespace android
 
 No newline at end of file

libs/ui/GraphicBufferMapper.cpp

+0 −79
Original line number Original line Diff line number Diff line
@@ -341,84 +341,5 @@ status_t GraphicBufferMapper::setSmpte2094_10(buffer_handle_t bufferHandle, 
    return mMapper->setSmpte2094_10(bufferHandle, smpte2094_10);

    return mMapper->setSmpte2094_10(bufferHandle, smpte2094_10);

}

}





status_t GraphicBufferMapper::getDefaultPixelFormatFourCC(uint32_t width, uint32_t height,

                                                          PixelFormat format, uint32_t layerCount,

                                                          uint64_t usage,

                                                          uint32_t* outPixelFormatFourCC) {

    return mMapper->getDefaultPixelFormatFourCC(width, height, format, layerCount, usage,

                                                outPixelFormatFourCC);

}



status_t GraphicBufferMapper::getDefaultPixelFormatModifier(uint32_t width, uint32_t height,

                                                            PixelFormat format, uint32_t layerCount,

                                                            uint64_t usage,

                                                            uint64_t* outPixelFormatModifier) {

    return mMapper->getDefaultPixelFormatModifier(width, height, format, layerCount, usage,

                                                  outPixelFormatModifier);

}



status_t GraphicBufferMapper::getDefaultAllocationSize(uint32_t width, uint32_t height,

                                                       PixelFormat format, uint32_t layerCount,

                                                       uint64_t usage,

                                                       uint64_t* outAllocationSize) {

    return mMapper->getDefaultAllocationSize(width, height, format, layerCount, usage,

                                             outAllocationSize);

}



status_t GraphicBufferMapper::getDefaultProtectedContent(uint32_t width, uint32_t height,

                                                         PixelFormat format, uint32_t layerCount,

                                                         uint64_t usage,

                                                         uint64_t* outProtectedContent) {

    return mMapper->getDefaultProtectedContent(width, height, format, layerCount, usage,

                                               outProtectedContent);

}



status_t GraphicBufferMapper::getDefaultCompression(

        uint32_t width, uint32_t height, PixelFormat format, uint32_t layerCount, uint64_t usage,

        aidl::android::hardware::graphics::common::ExtendableType* outCompression) {

    return mMapper->getDefaultCompression(width, height, format, layerCount, usage, outCompression);

}



status_t GraphicBufferMapper::getDefaultCompression(uint32_t width, uint32_t height,

                                                    PixelFormat format, uint32_t layerCount,

                                                    uint64_t usage,

                                                    ui::Compression* outCompression) {

    return mMapper->getDefaultCompression(width, height, format, layerCount, usage, outCompression);

}



status_t GraphicBufferMapper::getDefaultInterlaced(

        uint32_t width, uint32_t height, PixelFormat format, uint32_t layerCount, uint64_t usage,

        aidl::android::hardware::graphics::common::ExtendableType* outInterlaced) {

    return mMapper->getDefaultInterlaced(width, height, format, layerCount, usage, outInterlaced);

}



status_t GraphicBufferMapper::getDefaultInterlaced(uint32_t width, uint32_t height,

                                                   PixelFormat format, uint32_t layerCount,

                                                   uint64_t usage, ui::Interlaced* outInterlaced) {

    return mMapper->getDefaultInterlaced(width, height, format, layerCount, usage, outInterlaced);

}



status_t GraphicBufferMapper::getDefaultChromaSiting(

        uint32_t width, uint32_t height, PixelFormat format, uint32_t layerCount, uint64_t usage,

        aidl::android::hardware::graphics::common::ExtendableType* outChromaSiting) {

    return mMapper->getDefaultChromaSiting(width, height, format, layerCount, usage,

                                           outChromaSiting);

}



status_t GraphicBufferMapper::getDefaultChromaSiting(uint32_t width, uint32_t height,

                                                     PixelFormat format, uint32_t layerCount,

                                                     uint64_t usage,

                                                     ui::ChromaSiting* outChromaSiting) {

    return mMapper->getDefaultChromaSiting(width, height, format, layerCount, usage,

                                           outChromaSiting);

}



status_t GraphicBufferMapper::getDefaultPlaneLayouts(

        uint32_t width, uint32_t height, PixelFormat format, uint32_t layerCount, uint64_t usage,

        std::vector<ui::PlaneLayout>* outPlaneLayouts) {

    return mMapper->getDefaultPlaneLayouts(width, height, format, layerCount, usage,

                                           outPlaneLayouts);

}



// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

}; // namespace android
 
}; // namespace android

libs/ui/include/ui/Gralloc.h

+0 −66
Original line number Original line Diff line number Diff line
@@ -200,72 +200,6 @@ public: 
                                     std::optional<std::vector<uint8_t>> /*smpte2094_10*/) const {

                                     std::optional<std::vector<uint8_t>> /*smpte2094_10*/) const {

        return INVALID_OPERATION;

        return INVALID_OPERATION;

    }

    }

    virtual status_t getDefaultPixelFormatFourCC(uint32_t /*width*/, uint32_t /*height*/,

                                                 PixelFormat /*format*/, uint32_t /*layerCount*/,

                                                 uint64_t /*usage*/,

                                                 uint32_t* /*outPixelFormatFourCC*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultPixelFormatModifier(uint32_t /*width*/, uint32_t /*height*/,

                                                   PixelFormat /*format*/, uint32_t /*layerCount*/,

                                                   uint64_t /*usage*/,

                                                   uint64_t* /*outPixelFormatModifier*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultAllocationSize(uint32_t /*width*/, uint32_t /*height*/,

                                              PixelFormat /*format*/, uint32_t /*layerCount*/,

                                              uint64_t /*usage*/,

                                              uint64_t* /*outAllocationSize*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultProtectedContent(uint32_t /*width*/, uint32_t /*height*/,

                                                PixelFormat /*format*/, uint32_t /*layerCount*/,

                                                uint64_t /*usage*/,

                                                uint64_t* /*outProtectedContent*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultCompression(

            uint32_t /*width*/, uint32_t /*height*/, PixelFormat /*format*/,

            uint32_t /*layerCount*/, uint64_t /*usage*/,

            aidl::android::hardware::graphics::common::ExtendableType* /*outCompression*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultCompression(uint32_t /*width*/, uint32_t /*height*/,

                                           PixelFormat /*format*/, uint32_t /*layerCount*/,

                                           uint64_t /*usage*/,

                                           ui::Compression* /*outCompression*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultInterlaced(

            uint32_t /*width*/, uint32_t /*height*/, PixelFormat /*format*/,

            uint32_t /*layerCount*/, uint64_t /*usage*/,

            aidl::android::hardware::graphics::common::ExtendableType* /*outInterlaced*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultInterlaced(uint32_t /*width*/, uint32_t /*height*/,

                                          PixelFormat /*format*/, uint32_t /*layerCount*/,

                                          uint64_t /*usage*/,

                                          ui::Interlaced* /*outInterlaced*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultChromaSiting(

            uint32_t /*width*/, uint32_t /*height*/, PixelFormat /*format*/,

            uint32_t /*layerCount*/, uint64_t /*usage*/,

            aidl::android::hardware::graphics::common::ExtendableType* /*outChromaSiting*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultChromaSiting(uint32_t /*width*/, uint32_t /*height*/,

                                            PixelFormat /*format*/, uint32_t /*layerCount*/,

                                            uint64_t /*usage*/,

                                            ui::ChromaSiting* /*outChromaSiting*/) const {

        return INVALID_OPERATION;

    }

    virtual status_t getDefaultPlaneLayouts(

            uint32_t /*width*/, uint32_t /*height*/, PixelFormat /*format*/,

            uint32_t /*layerCount*/, uint64_t /*usage*/,

            std::vector<ui::PlaneLayout>* /*outPlaneLayouts*/) const {

        return INVALID_OPERATION;

    }

};

};





// A wrapper to IAllocator

// A wrapper to IAllocator

libs/ui/include/ui/Gralloc4.h

+0 −36
Original line number Original line Diff line number Diff line
@@ -120,42 +120,6 @@ public: 
                             std::optional<std::vector<uint8_t>>* outSmpte2094_10) const override;

                             std::optional<std::vector<uint8_t>>* outSmpte2094_10) const override;

    status_t setSmpte2094_10(buffer_handle_t bufferHandle,

    status_t setSmpte2094_10(buffer_handle_t bufferHandle,

                             std::optional<std::vector<uint8_t>> smpte2094_10) const override;

                             std::optional<std::vector<uint8_t>> smpte2094_10) const override;

    status_t getDefaultPixelFormatFourCC(uint32_t width, uint32_t height, PixelFormat format,

                                         uint32_t layerCount, uint64_t usage,

                                         uint32_t* outPixelFormatFourCC) const override;

    status_t getDefaultPixelFormatModifier(uint32_t width, uint32_t height, PixelFormat format,

                                           uint32_t layerCount, uint64_t usage,

                                           uint64_t* outPixelFormatModifier) const override;

    status_t getDefaultAllocationSize(uint32_t width, uint32_t height, PixelFormat format,

                                      uint32_t layerCount, uint64_t usage,

                                      uint64_t* outAllocationSize) const override;

    status_t getDefaultProtectedContent(uint32_t width, uint32_t height, PixelFormat format,

                                        uint32_t layerCount, uint64_t usage,

                                        uint64_t* outProtectedContent) const override;

    status_t getDefaultCompression(uint32_t width, uint32_t height, PixelFormat format,

                                   uint32_t layerCount, uint64_t usage,

                                   aidl::android::hardware::graphics::common::ExtendableType*

                                           outCompression) const override;

    status_t getDefaultCompression(uint32_t width, uint32_t height, PixelFormat format,

                                   uint32_t layerCount, uint64_t usage,

                                   ui::Compression* outCompression) const override;

    status_t getDefaultInterlaced(uint32_t width, uint32_t height, PixelFormat format,

                                  uint32_t layerCount, uint64_t usage,

                                  aidl::android::hardware::graphics::common::ExtendableType*

                                          outInterlaced) const override;

    status_t getDefaultInterlaced(uint32_t width, uint32_t height, PixelFormat format,

                                  uint32_t layerCount, uint64_t usage,

                                  ui::Interlaced* outInterlaced) const override;

    status_t getDefaultChromaSiting(uint32_t width, uint32_t height, PixelFormat format,

                                    uint32_t layerCount, uint64_t usage,

                                    aidl::android::hardware::graphics::common::ExtendableType*

                                            outChromaSiting) const override;

    status_t getDefaultChromaSiting(uint32_t width, uint32_t height, PixelFormat format,

                                    uint32_t layerCount, uint64_t usage,

                                    ui::ChromaSiting* outChromaSiting) const override;

    status_t getDefaultPlaneLayouts(uint32_t width, uint32_t height, PixelFormat format,

                                    uint32_t layerCount, uint64_t usage,

                                    std::vector<ui::PlaneLayout>* outPlaneLayouts) const override;





    std::vector<android::hardware::graphics::mapper::V4_0::IMapper::MetadataTypeDescription>

    std::vector<android::hardware::graphics::mapper::V4_0::IMapper::MetadataTypeDescription>

    listSupportedMetadataTypes() const;

    listSupportedMetadataTypes() const;