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

Commit 697526bc authored by Iliyan Malchev's avatar Iliyan Malchev
Browse files

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer 



Change-Id: Idc2eabaa805bb6d308ebb315872623f28d428417
Signed-off-by: default avatarIliyan Malchev <malchev@google.com>
parent ec10d231

include/gui/SurfaceTextureClient.h

+8 −8
Original line number Diff line number Diff line
@@ -45,20 +45,20 @@ private: 
    SurfaceTextureClient(const SurfaceTextureClient& rhs);



    // ANativeWindow hooks

    static int cancelBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);

    static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int cancelBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);

    static int dequeueBuffer(ANativeWindow* window, ANativeWindowBuffer** buffer);

    static int lockBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);

    static int perform(ANativeWindow* window, int operation, ...);

    static int query(const ANativeWindow* window, int what, int* value);

    static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int queueBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);

    static int setSwapInterval(ANativeWindow* window, int interval);



    int cancelBuffer(android_native_buffer_t* buffer);

    int dequeueBuffer(android_native_buffer_t** buffer);

    int lockBuffer(android_native_buffer_t* buffer);

    int cancelBuffer(ANativeWindowBuffer* buffer);

    int dequeueBuffer(ANativeWindowBuffer** buffer);

    int lockBuffer(ANativeWindowBuffer* buffer);

    int perform(int operation, va_list args);

    int query(int what, int* value) const;

    int queueBuffer(android_native_buffer_t* buffer);

    int queueBuffer(ANativeWindowBuffer* buffer);

    int setSwapInterval(int interval);



    int dispatchConnect(va_list args);

include/surfaceflinger/Surface.h

+8 −8
Original line number Diff line number Diff line
@@ -202,17 +202,17 @@ private: 
     *  ANativeWindow hooks

     */

    static int setSwapInterval(ANativeWindow* window, int interval);

    static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);

    static int cancelBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int dequeueBuffer(ANativeWindow* window, ANativeWindowBuffer** buffer);

    static int cancelBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);

    static int lockBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);

    static int queueBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);

    static int query(const ANativeWindow* window, int what, int* value);

    static int perform(ANativeWindow* window, int operation, ...);



    int dequeueBuffer(android_native_buffer_t** buffer);

    int lockBuffer(android_native_buffer_t* buffer);

    int queueBuffer(android_native_buffer_t* buffer);

    int cancelBuffer(android_native_buffer_t* buffer);

    int dequeueBuffer(ANativeWindowBuffer** buffer);

    int lockBuffer(ANativeWindowBuffer* buffer);

    int queueBuffer(ANativeWindowBuffer* buffer);

    int cancelBuffer(ANativeWindowBuffer* buffer);

    int query(int what, int* value) const;

    int perform(int operation, va_list args);

include/ui/FramebufferNativeWindow.h

+3 −3
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ private: 
    friend class LightRefBase<FramebufferNativeWindow>;    

    ~FramebufferNativeWindow(); // this class cannot be overloaded

    static int setSwapInterval(ANativeWindow* window, int interval);

    static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer);

    static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer);

    static int dequeueBuffer(ANativeWindow* window, ANativeWindowBuffer** buffer);

    static int lockBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);

    static int queueBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);

    static int query(const ANativeWindow* window, int what, int* value);

    static int perform(ANativeWindow* window, int operation, ...);

include/ui/GraphicBuffer.h

+6 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <utils/Flattenable.h>

#include <pixelflinger/pixelflinger.h>



struct android_native_buffer_t;

struct ANativeWindowBuffer;



namespace android {
@@ -38,7 +38,7 @@ class GraphicBufferMapper; 


class GraphicBuffer

    : public EGLNativeBase<

        android_native_buffer_t, 

        ANativeWindowBuffer,

        GraphicBuffer, 

        LightRefBase<GraphicBuffer> >, public Flattenable

{
@@ -74,8 +74,8 @@ public: 
    GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage,

            uint32_t stride, native_handle_t* handle, bool keepOwnership);



    // create a buffer from an existing android_native_buffer_t

    GraphicBuffer(android_native_buffer_t* buffer, bool keepOwnership);

    // create a buffer from an existing ANativeWindowBuffer

    GraphicBuffer(ANativeWindowBuffer* buffer, bool keepOwnership);



    // return status

    status_t initCheck() const;
@@ -94,7 +94,7 @@ public: 
    status_t lock(GGLSurface* surface, uint32_t usage);

    status_t unlock();



    android_native_buffer_t* getNativeBuffer() const;

    ANativeWindowBuffer* getNativeBuffer() const;

    

    void setIndex(int index);

    int getIndex() const;
@@ -149,7 +149,7 @@ private: 


    // If we're wrapping another buffer then this reference will make sure it

    // doesn't get freed.

    sp<android_native_buffer_t> mWrappedBuffer;

    sp<ANativeWindowBuffer> mWrappedBuffer;

};



}; // namespace android

libs/gui/Surface.cpp

+10 −10
Original line number Diff line number Diff line
@@ -513,25 +513,25 @@ int Surface::setSwapInterval(ANativeWindow* window, int interval) { 
}



int Surface::dequeueBuffer(ANativeWindow* window, 

        android_native_buffer_t** buffer) {

        ANativeWindowBuffer** buffer) {

    Surface* self = getSelf(window);

    return self->dequeueBuffer(buffer);

}



int Surface::cancelBuffer(ANativeWindow* window,

        android_native_buffer_t* buffer) {

        ANativeWindowBuffer* buffer) {

    Surface* self = getSelf(window);

    return self->cancelBuffer(buffer);

}



int Surface::lockBuffer(ANativeWindow* window, 

        android_native_buffer_t* buffer) {

        ANativeWindowBuffer* buffer) {

    Surface* self = getSelf(window);

    return self->lockBuffer(buffer);

}



int Surface::queueBuffer(ANativeWindow* window, 

        android_native_buffer_t* buffer) {

        ANativeWindowBuffer* buffer) {

    Surface* self = getSelf(window);

    return self->queueBuffer(buffer);

}
@@ -570,7 +570,7 @@ bool Surface::needNewBuffer(int bufIdx, 
    return newNeewBuffer;

}



int Surface::dequeueBuffer(android_native_buffer_t** buffer)

int Surface::dequeueBuffer(ANativeWindowBuffer** buffer)

{

    status_t err = validate();

    if (err != NO_ERROR)
@@ -624,7 +624,7 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer) 
    return err;

}



int Surface::cancelBuffer(android_native_buffer_t* buffer)

int Surface::cancelBuffer(ANativeWindowBuffer* buffer)

{

    status_t err = validate(true);

    switch (err) {
@@ -651,7 +651,7 @@ int Surface::cancelBuffer(android_native_buffer_t* buffer) 
}





int Surface::lockBuffer(android_native_buffer_t* buffer)

int Surface::lockBuffer(ANativeWindowBuffer* buffer)

{

    status_t err = validate();

    if (err != NO_ERROR)
@@ -670,7 +670,7 @@ int Surface::lockBuffer(android_native_buffer_t* buffer) 
    return err;

}



int Surface::queueBuffer(android_native_buffer_t* buffer)

int Surface::queueBuffer(ANativeWindowBuffer* buffer)

{

    status_t err = validate();

    if (err != NO_ERROR)
@@ -969,7 +969,7 @@ status_t Surface::lock(SurfaceInfo* other, Region* dirtyIn, bool blocking) 
    // we're intending to do software rendering from this point

    setUsage(GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN);



    android_native_buffer_t* out;

    ANativeWindowBuffer* out;

    status_t err = dequeueBuffer(&out);

    LOGE_IF(err, "dequeueBuffer failed (%s)", strerror(-err));

    if (err == NO_ERROR) {
@@ -1063,7 +1063,7 @@ int Surface::getBufferIndex(const sp<GraphicBuffer>& buffer) const 
    if (idx < 0) {

        // The buffer doesn't have an index set.  See if the handle the same as

        // one of the buffers for which we do know the index.  This can happen

        // e.g. if GraphicBuffer is used to wrap an android_native_buffer_t that

        // e.g. if GraphicBuffer is used to wrap an ANativeWindowBuffer that

        // was dequeued from an ANativeWindow.

        for (size_t i = 0; i < mBuffers.size(); i++) {

            if (mBuffers[i] != 0 && buffer->handle == mBuffers[i]->handle) {