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

Commit 25bb8dbe authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "libcameraservice: update for revised HIDL gralloc" into oc-dev am: 8d8ebcaa 

am: a2fd98e2

Change-Id: Ie940d2eca7fac241d19649ba755029ec6af7b428
parents 0f63a68b a2fd98e2

services/camera/libcameraservice/device1/CameraHardwareInterface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ CameraHardwareInterface::setCrop(int32_t left, int32_t top, int32_t right, int32 
}



hardware::Return<Status>

CameraHardwareInterface::setUsage(hardware::graphics::allocator::V2_0::ProducerUsage usage) {

CameraHardwareInterface::setUsage(hardware::graphics::common::V1_0::BufferUsage usage) {

    Status s = Status::INTERNAL_ERROR;

    ANativeWindow *a = mPreviewWindow.get();

    if (a == nullptr) {

services/camera/libcameraservice/device1/CameraHardwareInterface.h

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ private: 
    hardware::Return<hardware::camera::common::V1_0::Status>

            setCrop(int32_t left, int32_t top, int32_t right, int32_t bottom) override;

    hardware::Return<hardware::camera::common::V1_0::Status>

            setUsage(hardware::graphics::allocator::V2_0::ProducerUsage usage) override;

            setUsage(hardware::graphics::common::V1_0::BufferUsage usage) override;

    hardware::Return<hardware::camera::common::V1_0::Status>

            setSwapInterval(int32_t interval) override;

    hardware::Return<void> getMinUndequeuedBufferCount(

services/camera/libcameraservice/device3/Camera3Device.cpp

+3 −3
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ DataspaceFlags Camera3Device::mapToHidlDataspace( 
    return dataSpace;

}



ConsumerUsageFlags Camera3Device::mapToConsumerUsage(

BufferUsageFlags Camera3Device::mapToConsumerUsage(

        uint32_t usage) {

    return usage;

}
@@ -555,12 +555,12 @@ int Camera3Device::mapToFrameworkFormat( 
}



uint32_t Camera3Device::mapConsumerToFrameworkUsage(

        ConsumerUsageFlags usage) {

        BufferUsageFlags usage) {

    return usage;

}



uint32_t Camera3Device::mapProducerToFrameworkUsage(

        ProducerUsageFlags usage) {

        BufferUsageFlags usage) {

    return usage;

}

services/camera/libcameraservice/device3/Camera3Device.h

+3 −3
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ class Camera3Device : 
    static hardware::graphics::common::V1_0::PixelFormat mapToPixelFormat(int frameworkFormat);

    static hardware::camera::device::V3_2::DataspaceFlags mapToHidlDataspace(

            android_dataspace dataSpace);

    static hardware::camera::device::V3_2::ConsumerUsageFlags mapToConsumerUsage(uint32_t usage);

    static hardware::camera::device::V3_2::BufferUsageFlags mapToConsumerUsage(uint32_t usage);

    static hardware::camera::device::V3_2::StreamRotation mapToStreamRotation(

            camera3_stream_rotation_t rotation);

    // Returns a negative error code if the passed-in operation mode is not valid.
@@ -607,9 +607,9 @@ class Camera3Device : 
    static camera3_buffer_status_t mapHidlBufferStatus(hardware::camera::device::V3_2::BufferStatus status);

    static int mapToFrameworkFormat(hardware::graphics::common::V1_0::PixelFormat pixelFormat);

    static uint32_t mapConsumerToFrameworkUsage(

            hardware::camera::device::V3_2::ConsumerUsageFlags usage);

            hardware::camera::device::V3_2::BufferUsageFlags usage);

    static uint32_t mapProducerToFrameworkUsage(

            hardware::camera::device::V3_2::ProducerUsageFlags usage);

            hardware::camera::device::V3_2::BufferUsageFlags usage);



    struct RequestTrigger {

        // Metadata tag number, e.g. android.control.aePrecaptureTrigger