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

Commit c3c8e08a authored by Mathias Agopian's avatar Mathias Agopian Committed by android-build-merger
Browse files

AHardwareBuffer now reports its stride am: 07b920e0 

am: 43e597da

Change-Id: Ic8f61bf6e8caa6c1204444c1094ededed01e57bf
parents 8ca33dd4 43e597da

libs/nativewindow/AHardwareBuffer.cpp

+6 −5
Original line number Original line Diff line number Diff line
@@ -50,8 +50,8 @@ int AHardwareBuffer_allocate(const AHardwareBuffer_Desc* desc, AHardwareBuffer** 
        return BAD_VALUE;

        return BAD_VALUE;

    }

    }





    if (desc->reserved != 0) {

    if (desc->rfu0 != 0 || desc->rfu1 != 0) {

        ALOGE("AHardwareBuffer_Desc::reserved field must be 0");

        ALOGE("AHardwareBuffer_Desc::rfu fields must be 0");

        return BAD_VALUE;

        return BAD_VALUE;

    }

    }
@@ -101,10 +101,11 @@ void AHardwareBuffer_describe(const AHardwareBuffer* buffer, 
    outDesc->width = gbuffer->getWidth();

    outDesc->width = gbuffer->getWidth();

    outDesc->height = gbuffer->getHeight();

    outDesc->height = gbuffer->getHeight();

    outDesc->layers = gbuffer->getLayerCount();

    outDesc->layers = gbuffer->getLayerCount();

    outDesc->format = AHardwareBuffer_convertFromPixelFormat(

    outDesc->format = AHardwareBuffer_convertFromPixelFormat(uint32_t(gbuffer->getPixelFormat()));

            static_cast<uint32_t>(gbuffer->getPixelFormat()));

    outDesc->usage = AHardwareBuffer_convertFromGrallocUsageBits(gbuffer->getUsage());

    outDesc->usage = AHardwareBuffer_convertFromGrallocUsageBits(gbuffer->getUsage());

    outDesc->reserved = 0;

    outDesc->stride = gbuffer->getStride();

    outDesc->rfu0 = 0;

    outDesc->rfu1 = 0;

}

}





int AHardwareBuffer_lock(AHardwareBuffer* buffer, uint64_t usage,

int AHardwareBuffer_lock(AHardwareBuffer* buffer, uint64_t usage,

libs/nativewindow/include/android/hardware_buffer.h

+6 −4
Original line number Original line Diff line number Diff line
@@ -137,12 +137,14 @@ enum { 
};

};





typedef struct AHardwareBuffer_Desc {

typedef struct AHardwareBuffer_Desc {

    uint32_t    width;

    uint32_t    width;      // width in pixels

    uint32_t    height;

    uint32_t    height;     // height in pixels

    uint32_t    layers;

    uint32_t    layers;     // number of images

    uint32_t    format;     // One of AHARDWAREBUFFER_FORMAT_*

    uint32_t    format;     // One of AHARDWAREBUFFER_FORMAT_*

    uint64_t    usage;      // Combination of AHARDWAREBUFFER_USAGE_*

    uint64_t    usage;      // Combination of AHARDWAREBUFFER_USAGE_*

    uint64_t    reserved;   // Initialize to zero, reserved for future use

    uint32_t    stride;     // Stride in pixels, ignored for AHardwareBuffer_allocate()

    uint32_t    rfu0;       // Initialize to zero, reserved for future use

    uint64_t    rfu1;       // Initialize to zero, reserved for future use

} AHardwareBuffer_Desc;

} AHardwareBuffer_Desc;





typedef struct AHardwareBuffer AHardwareBuffer;

typedef struct AHardwareBuffer AHardwareBuffer;