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

Commit 08ac1c81 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename WriteBufferQueueGetExternalSurface: Step 1" into oc-mr1-dev

parents bc52c703 5b5d4e11

libs/vr/libdvr/dvr_buffer_queue.cpp

+8 −0
Original line number Diff line number Diff line
@@ -208,6 +208,14 @@ int dvrWriteBufferQueueGetId(DvrWriteBufferQueue* write_queue) { 


int dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

                                          ANativeWindow** out_window) {

  ALOGW(

      "dvrWriteBufferQueueGetExternalSurface: This API has been deprecated and "

      "renamed to dvrWriteBufferQueueGetANativeWindow.");

  return dvrWriteBufferQueueGetANativeWindow(write_queue, out_window);

}



int dvrWriteBufferQueueGetANativeWindow(DvrWriteBufferQueue* write_queue,

                                        ANativeWindow** out_window) {

  if (!write_queue || !out_window)

    return -EINVAL;

libs/vr/libdvr/include/dvr/dvr_api.h

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ typedef ssize_t (*DvrWriteBufferQueueGetCapacityPtr)( 
typedef int (*DvrWriteBufferQueueGetIdPtr)(DvrWriteBufferQueue* write_queue);

typedef int (*DvrWriteBufferQueueGetExternalSurfacePtr)(

    DvrWriteBufferQueue* write_queue, ANativeWindow** out_window);

typedef int (*DvrWriteBufferQueueGetANativeWindowPtr)(

    DvrWriteBufferQueue* write_queue, ANativeWindow** out_window);

typedef int (*DvrWriteBufferQueueCreateReadQueuePtr)(

    DvrWriteBufferQueue* write_queue, DvrReadBufferQueue** out_read_queue);

typedef int (*DvrWriteBufferQueueDequeuePtr)(DvrWriteBufferQueue* write_queue,

libs/vr/libdvr/include/dvr/dvr_api_entries.h

+4 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ DVR_V1_API_ENTRY(BufferGlobalLayoutVersionGet); 
DVR_V1_API_ENTRY(WriteBufferQueueDestroy);

DVR_V1_API_ENTRY(WriteBufferQueueGetCapacity);

DVR_V1_API_ENTRY(WriteBufferQueueGetId);

DVR_V1_API_ENTRY(WriteBufferQueueGetExternalSurface);

DVR_V1_API_ENTRY(WriteBufferQueueGetExternalSurface);  // deprecated

DVR_V1_API_ENTRY(WriteBufferQueueCreateReadQueue);

DVR_V1_API_ENTRY(WriteBufferQueueDequeue);

DVR_V1_API_ENTRY(WriteBufferQueueResizeBuffer);
@@ -163,3 +163,6 @@ DVR_V1_API_ENTRY(ReadBufferQueueGetEventFd); 


// Create write buffer queue locally

DVR_V1_API_ENTRY(WriteBufferQueueCreate);



// Gets an ANativeWindow from DvrWriteBufferQueue.

DVR_V1_API_ENTRY(WriteBufferQueueGetANativeWindow);

libs/vr/libdvr/include/dvr/dvr_buffer_queue.h

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ int dvrWriteBufferQueueGetId(DvrWriteBufferQueue* write_queue); 
//     the method call succeeds.

// @return Zero on success; or -EINVAL if this DvrWriteBufferQueue does not

//     support being used as an android Surface.

int dvrWriteBufferQueueGetANativeWindow(DvrWriteBufferQueue* write_queue,

                                        ANativeWindow** out_window);



// @deprecated Please use dvrWriteBufferQueueGetANativeWindow instead.

int dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

                                          ANativeWindow** out_window);

libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ TEST_F(DvrBufferQueueTest, TestDequeuePostDequeueRelease) { 
  dvrReadBufferQueueDestroy(read_queue);

}



TEST_F(DvrBufferQueueTest, TestGetExternalSurface) {

TEST_F(DvrBufferQueueTest, TestGetANativeWindow) {

  int ret = dvrWriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      /*capacity=*/0, sizeof(TestMeta), &write_queue_);
@@ -242,7 +242,7 @@ TEST_F(DvrBufferQueueTest, TestGetExternalSurface) { 


  // The |write_queue_| doesn't have proper metadata (must be

  // DvrNativeBufferMetadata) configured during creation.

  ret = dvrWriteBufferQueueGetExternalSurface(write_queue_, &window);

  ret = dvrWriteBufferQueueGetANativeWindow(write_queue_, &window);

  ASSERT_EQ(-EINVAL, ret);

  ASSERT_EQ(nullptr, window);

  dvrWriteBufferQueueDestroy(write_queue_);
@@ -257,7 +257,7 @@ TEST_F(DvrBufferQueueTest, TestGetExternalSurface) { 
  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, write_queue_);



  ret = dvrWriteBufferQueueGetExternalSurface(write_queue_, &window);

  ret = dvrWriteBufferQueueGetANativeWindow(write_queue_, &window);

  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, window);