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

Commit 1188cdb7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4593582 from 7a7d7e75 to pi-release 

Change-Id: Iba3eacd73556d92182fa2e531471d850fdc85a5a
parents 2ee855e9 7a7d7e75

cmds/installd/tests/installd_dexopt_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -675,7 +675,8 @@ class ProfileTest : public DexoptTest { 
        run_cmd("touch " + expected_profile_content);

        run_cmd("profman --profile-file=" + cur_profile_ +

                " --profile-file=" + ref_profile_ +

                " --reference-profile-file=" + expected_profile_content);

                " --reference-profile-file=" + expected_profile_content +

                " --apk=" + apk_path_);



        ASSERT_TRUE(AreFilesEqual(expected_profile_content, snap_profile_));

libs/input/VelocityTracker.cpp

+4 −4
Original line number Diff line number Diff line
@@ -325,8 +325,8 @@ void VelocityTracker::addMovement(const MotionEvent* event) { 
        eventTime = event->getHistoricalEventTime(h);

        for (size_t i = 0; i < pointerCount; i++) {

            uint32_t index = pointerIndex[i];

            positions[index].x = event->getHistoricalX(i, h);

            positions[index].y = event->getHistoricalY(i, h);

            positions[index].x = event->getHistoricalRawX(i, h);

            positions[index].y = event->getHistoricalRawY(i, h);

        }

        addMovement(eventTime, idBits, positions);

    }
@@ -334,8 +334,8 @@ void VelocityTracker::addMovement(const MotionEvent* event) { 
    eventTime = event->getEventTime();

    for (size_t i = 0; i < pointerCount; i++) {

        uint32_t index = pointerIndex[i];

        positions[index].x = event->getX(i);

        positions[index].y = event->getY(i);

        positions[index].x = event->getRawX(i);

        positions[index].y = event->getRawY(i);

    }

    addMovement(eventTime, idBits, positions);

}

libs/vr/libdvr/tests/Android.bp

+22 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ static_libraries = [ 


cc_test {

    srcs: [

        "dvr_buffer_queue-test.cpp",

        "dvr_display_manager-test.cpp",

        "dvr_named_buffer-test.cpp",

    ],
@@ -53,3 +52,25 @@ cc_test { 
    ],

    name: "dvr_api-test",

}



cc_test {

    srcs: [

        "dvr_buffer_queue-test.cpp",

    ],



    header_libs: [

        "libdvr_headers",

        "libbase_headers",

    ],

    shared_libs: [

        "liblog",

        "libnativewindow",

    ],

    cflags: [

        "-DLOG_TAG=\"dvr_buffer_queue-test\"",

        "-DTRACE=0",

        "-O0",

        "-g",

    ],

    name: "dvr_buffer_queue-test",

}

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

+104 −84
Original line number Diff line number Diff line 
#include <android-base/unique_fd.h>

#include <android/log.h>

#include <android/native_window.h>

#include <android-base/unique_fd.h>

#include <dlfcn.h>

#include <dvr/dvr_api.h>

#include <dvr/dvr_buffer_queue.h>
@@ -13,6 +14,8 @@ 
#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)

#endif



#define ASSERT_NOT_NULL(x) ASSERT_TRUE((x) != nullptr)



#ifndef ALOGD_IF

#define ALOGD_IF(cond, ...) \

  ((__predict_false(cond)) ? ((void)ALOGD(__VA_ARGS__)) : (void)0)
@@ -40,11 +43,26 @@ class DvrBufferQueueTest : public ::testing::Test { 
  }



 protected:

  void SetUp() override {

    platform_handle_ = dlopen("libdvr.so", RTLD_NOW | RTLD_LOCAL);

    ASSERT_NOT_NULL(platform_handle_) << "Dvr shared library missing.";



    auto dvr_get_api = reinterpret_cast<decltype(&dvrGetApi)>(

        dlsym(platform_handle_, "dvrGetApi"));

    ASSERT_NOT_NULL(dvr_get_api) << "Platform library missing dvrGetApi.";



    ASSERT_EQ(dvr_get_api(&api_, sizeof(api_), /*version=*/1), 0)

        << "Unable to find compatible Dvr API.";

  }



  void TearDown() override {

    if (write_queue_ != nullptr) {

      dvrWriteBufferQueueDestroy(write_queue_);

      api_.WriteBufferQueueDestroy(write_queue_);

      write_queue_ = nullptr;

    }

    if (platform_handle_ != nullptr) {

      dlclose(platform_handle_);

    }

  }



  void HandleBufferAvailable() {
@@ -61,88 +79,90 @@ class DvrBufferQueueTest : public ::testing::Test { 
  DvrWriteBufferQueue* write_queue_{nullptr};

  int buffer_available_count_{0};

  int buffer_removed_count_{0};

  void* platform_handle_{nullptr};

  DvrApi_v1 api_{};

};



TEST_F(DvrBufferQueueTest, WriteQueueCreateDestroy) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      /*capacity=*/0, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(0, ret);



  dvrWriteBufferQueueDestroy(write_queue_);

  api_.WriteBufferQueueDestroy(write_queue_);

  write_queue_ = nullptr;

}



TEST_F(DvrBufferQueueTest, WriteQueueGetCapacity) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      kQueueCapacity, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(0, ret);



  size_t capacity = dvrWriteBufferQueueGetCapacity(write_queue_);

  size_t capacity = api_.WriteBufferQueueGetCapacity(write_queue_);



  ALOGD_IF(TRACE, "TestWrite_QueueGetCapacity, capacity=%zu", capacity);

  ASSERT_EQ(kQueueCapacity, capacity);

}



TEST_F(DvrBufferQueueTest, CreateReadQueueFromWriteQueue) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      /*capacity=*/0, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(0, ret);



  DvrReadBufferQueue* read_queue = nullptr;

  ret = dvrWriteBufferQueueCreateReadQueue(write_queue_, &read_queue);

  ret = api_.WriteBufferQueueCreateReadQueue(write_queue_, &read_queue);



  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, read_queue);



  dvrReadBufferQueueDestroy(read_queue);

  api_.ReadBufferQueueDestroy(read_queue);

}



TEST_F(DvrBufferQueueTest, CreateReadQueueFromReadQueue) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      /*capacity=*/0, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(0, ret);



  DvrReadBufferQueue* read_queue1 = nullptr;

  DvrReadBufferQueue* read_queue2 = nullptr;

  ret = dvrWriteBufferQueueCreateReadQueue(write_queue_, &read_queue1);

  ret = api_.WriteBufferQueueCreateReadQueue(write_queue_, &read_queue1);



  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, read_queue1);



  ret = dvrReadBufferQueueCreateReadQueue(read_queue1, &read_queue2);

  ret = api_.ReadBufferQueueCreateReadQueue(read_queue1, &read_queue2);

  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, read_queue2);

  ASSERT_NE(read_queue1, read_queue2);



  dvrReadBufferQueueDestroy(read_queue1);

  dvrReadBufferQueueDestroy(read_queue2);

  api_.ReadBufferQueueDestroy(read_queue1);

  api_.ReadBufferQueueDestroy(read_queue2);

}



TEST_F(DvrBufferQueueTest, GainBuffer) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      kQueueCapacity, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(ret, 0);



  DvrWriteBuffer* wb = nullptr;

  EXPECT_FALSE(dvrWriteBufferIsValid(wb));

  EXPECT_FALSE(api_.WriteBufferIsValid(wb));



  DvrNativeBufferMetadata meta;

  int fence_fd = -1;

  ret = dvrWriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb, &meta,

  ret = api_.WriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb, &meta,

                                        &fence_fd);

  ASSERT_EQ(ret, 0);

  EXPECT_EQ(fence_fd, -1);

  EXPECT_NE(wb, nullptr);

  EXPECT_TRUE(dvrWriteBufferIsValid(wb));

  EXPECT_TRUE(api_.WriteBufferIsValid(wb));

}



TEST_F(DvrBufferQueueTest, AcquirePostGainRelease) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      kQueueCapacity, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(ret, 0);
@@ -154,40 +174,40 @@ TEST_F(DvrBufferQueueTest, AcquirePostGainRelease) { 
  DvrNativeBufferMetadata meta2;

  int fence_fd = -1;



  ret = dvrWriteBufferQueueCreateReadQueue(write_queue_, &read_queue);

  ret = api_.WriteBufferQueueCreateReadQueue(write_queue_, &read_queue);



  ASSERT_EQ(ret, 0);

  ASSERT_NE(read_queue, nullptr);



  dvrReadBufferQueueSetBufferAvailableCallback(read_queue,

                                               &BufferAvailableCallback, this);

  api_.ReadBufferQueueSetBufferAvailableCallback(

      read_queue, &BufferAvailableCallback, this);



  // Gain buffer for writing.

  ret = dvrWriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb, &meta1,

                                      &fence_fd);

  ret = api_.WriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb,

                                        &meta1, &fence_fd);

  ASSERT_EQ(ret, 0);

  ASSERT_NE(wb, nullptr);

  ASSERT_TRUE(dvrWriteBufferIsValid(wb));

  ASSERT_TRUE(api_.WriteBufferIsValid(wb));

  ALOGD_IF(TRACE, "TestDequeuePostDequeueRelease, gain buffer %p, fence_fd=%d",

           wb, fence_fd);

  android::base::unique_fd release_fence(fence_fd);



  // Post buffer to the read_queue.

  meta1.timestamp = 42;

  ret = dvrWriteBufferQueuePostBuffer(write_queue_, wb, &meta1, /*fence=*/-1);

  ret = api_.WriteBufferQueuePostBuffer(write_queue_, wb, &meta1, /*fence=*/-1);

  ASSERT_EQ(ret, 0);

  ASSERT_FALSE(dvrWriteBufferIsValid(wb));

  ASSERT_FALSE(api_.WriteBufferIsValid(wb));

  wb = nullptr;



  // Acquire buffer for reading.

  ret = dvrReadBufferQueueAcquireBuffer(read_queue, /*timeout=*/10, &rb, &meta2,

                                        &fence_fd);

  ret = api_.ReadBufferQueueAcquireBuffer(read_queue, /*timeout=*/10, &rb,

                                          &meta2, &fence_fd);

  ASSERT_EQ(ret, 0);

  ASSERT_NE(rb, nullptr);



  // Dequeue is successfully, BufferAvailableCallback should be fired once.

  ASSERT_EQ(buffer_available_count_, 1);

  ASSERT_TRUE(dvrReadBufferIsValid(rb));

  ASSERT_TRUE(api_.ReadBufferIsValid(rb));



  // Metadata should be passed along from producer to consumer properly.

  ASSERT_EQ(meta1.timestamp, meta2.timestamp);
@@ -198,31 +218,31 @@ TEST_F(DvrBufferQueueTest, AcquirePostGainRelease) { 
  android::base::unique_fd acquire_fence(fence_fd);



  // Release buffer to the write_queue.

  ret = dvrReadBufferQueueReleaseBuffer(read_queue, rb, &meta2,

  ret = api_.ReadBufferQueueReleaseBuffer(read_queue, rb, &meta2,

                                          /*release_fence_fd=*/-1);

  ASSERT_EQ(ret, 0);

  ASSERT_FALSE(dvrReadBufferIsValid(rb));

  ASSERT_FALSE(api_.ReadBufferIsValid(rb));

  rb = nullptr;



  // TODO(b/34387835) Currently buffer allocation has to happen after all queues

  // are initialized.

  size_t capacity = dvrReadBufferQueueGetCapacity(read_queue);

  size_t capacity = api_.ReadBufferQueueGetCapacity(read_queue);



  ALOGD_IF(TRACE, "TestDequeuePostDequeueRelease, capacity=%zu", capacity);

  ASSERT_EQ(kQueueCapacity, capacity);



  dvrReadBufferQueueDestroy(read_queue);

  api_.ReadBufferQueueDestroy(read_queue);

}



TEST_F(DvrBufferQueueTest, GetANativeWindow) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      /*capacity=*/0, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, write_queue_);



  ANativeWindow* window = nullptr;

  ret = dvrWriteBufferQueueGetANativeWindow(write_queue_, &window);

  ret = api_.WriteBufferQueueGetANativeWindow(write_queue_, &window);

  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, window);
@@ -238,7 +258,7 @@ TEST_F(DvrBufferQueueTest, GetANativeWindow) { 
// Before each dequeue operation, we resize the buffer queue and expect the

// queue always return buffer with desired dimension.

TEST_F(DvrBufferQueueTest, ResizeBuffer) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      kQueueCapacity, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(0, ret);
@@ -255,37 +275,37 @@ TEST_F(DvrBufferQueueTest, ResizeBuffer) { 
  AHardwareBuffer* ahb3 = nullptr;

  AHardwareBuffer_Desc buffer_desc;



  ret = dvrWriteBufferQueueCreateReadQueue(write_queue_, &read_queue);

  ret = api_.WriteBufferQueueCreateReadQueue(write_queue_, &read_queue);



  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, read_queue);



  dvrReadBufferQueueSetBufferRemovedCallback(read_queue, &BufferRemovedCallback,

                                             this);

  api_.ReadBufferQueueSetBufferRemovedCallback(read_queue,

                                               &BufferRemovedCallback, this);



  // Handle all pending events on the read queue.

  ret = dvrReadBufferQueueHandleEvents(read_queue);

  ret = api_.ReadBufferQueueHandleEvents(read_queue);

  ASSERT_EQ(0, ret);



  size_t capacity = dvrReadBufferQueueGetCapacity(read_queue);

  size_t capacity = api_.ReadBufferQueueGetCapacity(read_queue);

  ALOGD_IF(TRACE, "TestResizeBuffer, capacity=%zu", capacity);

  ASSERT_EQ(kQueueCapacity, capacity);



  // Resize before dequeuing.

  constexpr uint32_t w1 = 10;

  ret = dvrWriteBufferQueueResizeBuffer(write_queue_, w1, kBufferHeight);

  ret = api_.WriteBufferQueueResizeBuffer(write_queue_, w1, kBufferHeight);

  ASSERT_EQ(0, ret);



  // Gain first buffer for writing. All buffers will be resized.

  ret = dvrWriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb1, &meta,

                                      &fence_fd);

  ret = api_.WriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb1,

                                        &meta, &fence_fd);

  ASSERT_EQ(0, ret);

  ASSERT_TRUE(dvrWriteBufferIsValid(wb1));

  ASSERT_TRUE(api_.WriteBufferIsValid(wb1));

  ALOGD_IF(TRACE, "TestResizeBuffer, gain buffer %p", wb1);

  android::base::unique_fd release_fence1(fence_fd);



  // Check the buffer dimension.

  ret = dvrWriteBufferGetAHardwareBuffer(wb1, &ahb1);

  ret = api_.WriteBufferGetAHardwareBuffer(wb1, &ahb1);

  ASSERT_EQ(0, ret);

  AHardwareBuffer_describe(ahb1, &buffer_desc);

  ASSERT_EQ(w1, buffer_desc.width);
@@ -294,26 +314,26 @@ TEST_F(DvrBufferQueueTest, ResizeBuffer) { 


  // For the first resize, all buffers are reallocated.

  int expected_buffer_removed_count = kQueueCapacity;

  ret = dvrReadBufferQueueHandleEvents(read_queue);

  ret = api_.ReadBufferQueueHandleEvents(read_queue);

  ASSERT_EQ(0, ret);

  ASSERT_EQ(expected_buffer_removed_count, buffer_removed_count_);



  // Resize the queue. We are testing with blob format, keep height to be 1.

  constexpr uint32_t w2 = 20;

  ret = dvrWriteBufferQueueResizeBuffer(write_queue_, w2, kBufferHeight);

  ret = api_.WriteBufferQueueResizeBuffer(write_queue_, w2, kBufferHeight);

  ASSERT_EQ(0, ret);



  // The next buffer we dequeued should have new width.

  ret = dvrWriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb2, &meta,

                                      &fence_fd);

  ret = api_.WriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb2,

                                        &meta, &fence_fd);

  ASSERT_EQ(0, ret);

  ASSERT_TRUE(dvrWriteBufferIsValid(wb2));

  ASSERT_TRUE(api_.WriteBufferIsValid(wb2));

  ALOGD_IF(TRACE, "TestResizeBuffer, gain buffer %p, fence_fd=%d", wb2,

           fence_fd);

  android::base::unique_fd release_fence2(fence_fd);



  // Check the buffer dimension, should be new width

  ret = dvrWriteBufferGetAHardwareBuffer(wb2, &ahb2);

  ret = api_.WriteBufferGetAHardwareBuffer(wb2, &ahb2);

  ASSERT_EQ(0, ret);

  AHardwareBuffer_describe(ahb2, &buffer_desc);

  ASSERT_EQ(w2, buffer_desc.width);
@@ -321,26 +341,26 @@ TEST_F(DvrBufferQueueTest, ResizeBuffer) { 


  // For the second resize, all but one buffers are reallocated.

  expected_buffer_removed_count += (kQueueCapacity - 1);

  ret = dvrReadBufferQueueHandleEvents(read_queue);

  ret = api_.ReadBufferQueueHandleEvents(read_queue);

  ASSERT_EQ(0, ret);

  ASSERT_EQ(expected_buffer_removed_count, buffer_removed_count_);



  // Resize the queue for the third time.

  constexpr uint32_t w3 = 30;

  ret = dvrWriteBufferQueueResizeBuffer(write_queue_, w3, kBufferHeight);

  ret = api_.WriteBufferQueueResizeBuffer(write_queue_, w3, kBufferHeight);

  ASSERT_EQ(0, ret);



  // The next buffer we dequeued should have new width.

  ret = dvrWriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb3, &meta,

                                      &fence_fd);

  ret = api_.WriteBufferQueueGainBuffer(write_queue_, /*timeout=*/0, &wb3,

                                        &meta, &fence_fd);

  ASSERT_EQ(0, ret);

  ASSERT_TRUE(dvrWriteBufferIsValid(wb3));

  ASSERT_TRUE(api_.WriteBufferIsValid(wb3));

  ALOGD_IF(TRACE, "TestResizeBuffer, gain buffer %p, fence_fd=%d", wb3,

           fence_fd);

  android::base::unique_fd release_fence3(fence_fd);



  // Check the buffer dimension, should be new width

  ret = dvrWriteBufferGetAHardwareBuffer(wb3, &ahb3);

  ret = api_.WriteBufferGetAHardwareBuffer(wb3, &ahb3);

  ASSERT_EQ(0, ret);

  AHardwareBuffer_describe(ahb3, &buffer_desc);

  ASSERT_EQ(w3, buffer_desc.width);
@@ -348,26 +368,26 @@ TEST_F(DvrBufferQueueTest, ResizeBuffer) { 


  // For the third resize, all but two buffers are reallocated.

  expected_buffer_removed_count += (kQueueCapacity - 2);

  ret = dvrReadBufferQueueHandleEvents(read_queue);

  ret = api_.ReadBufferQueueHandleEvents(read_queue);

  ASSERT_EQ(0, ret);

  ASSERT_EQ(expected_buffer_removed_count, buffer_removed_count_);



  dvrReadBufferQueueDestroy(read_queue);

  api_.ReadBufferQueueDestroy(read_queue);

}



TEST_F(DvrBufferQueueTest, ReadQueueEventFd) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      kQueueCapacity, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(0, ret);



  DvrReadBufferQueue* read_queue = nullptr;

  ret = dvrWriteBufferQueueCreateReadQueue(write_queue_, &read_queue);

  ret = api_.WriteBufferQueueCreateReadQueue(write_queue_, &read_queue);



  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, read_queue);



  int event_fd = dvrReadBufferQueueGetEventFd(read_queue);

  int event_fd = api_.ReadBufferQueueGetEventFd(read_queue);

  ASSERT_GT(event_fd, 0);

}
@@ -375,14 +395,14 @@ TEST_F(DvrBufferQueueTest, ReadQueueEventFd) { 
// Dvr{Read,Write}Buffer(s) during their lifecycles. And for the same buffer_id,

// the corresponding AHardwareBuffer handle stays the same.

TEST_F(DvrBufferQueueTest, StableBufferIdAndHardwareBuffer) {

  int ret = dvrWriteBufferQueueCreate(

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      kQueueCapacity, sizeof(DvrNativeBufferMetadata), &write_queue_);

  ASSERT_EQ(0, ret);



  int fence_fd = -1;

  DvrReadBufferQueue* read_queue = nullptr;

  EXPECT_EQ(0, dvrWriteBufferQueueCreateReadQueue(write_queue_, &read_queue));

  EXPECT_EQ(0, api_.WriteBufferQueueCreateReadQueue(write_queue_, &read_queue));



  // Read buffers.

  std::array<DvrReadBuffer*, kQueueCapacity> rbs;
@@ -400,16 +420,16 @@ TEST_F(DvrBufferQueueTest, StableBufferIdAndHardwareBuffer) { 
  // This test runs the following operations many many times. Thus we prefer to

  // use ASSERT_XXX rather than EXPECT_XXX to avoid spamming the output.

  std::function<void(size_t i)> Gain = [&](size_t i) {

    int ret = dvrWriteBufferQueueGainBuffer(write_queue_, /*timeout=*/10,

    int ret = api_.WriteBufferQueueGainBuffer(write_queue_, /*timeout=*/10,

                                              &wbs[i], &metas[i], &fence_fd);

    ASSERT_EQ(ret, 0);

    ASSERT_LT(fence_fd, 0);  // expect invalid fence.

    ASSERT_TRUE(dvrWriteBufferIsValid(wbs[i]));

    int buffer_id = dvrWriteBufferGetId(wbs[i]);

    ASSERT_TRUE(api_.WriteBufferIsValid(wbs[i]));

    int buffer_id = api_.WriteBufferGetId(wbs[i]);

    ASSERT_GT(buffer_id, 0);



    AHardwareBuffer* hb = nullptr;

    ASSERT_EQ(0, dvrWriteBufferGetAHardwareBuffer(wbs[i], &hb));

    ASSERT_EQ(0, api_.WriteBufferGetAHardwareBuffer(wbs[i], &hb));



    auto whb_it = whbs.find(buffer_id);

    if (whb_it == whbs.end()) {
@@ -425,26 +445,26 @@ TEST_F(DvrBufferQueueTest, StableBufferIdAndHardwareBuffer) { 
  };



  std::function<void(size_t i)> Post = [&](size_t i) {

    ASSERT_TRUE(dvrWriteBufferIsValid(wbs[i]));

    ASSERT_TRUE(api_.WriteBufferIsValid(wbs[i]));



    metas[i].timestamp++;

    int ret = dvrWriteBufferQueuePostBuffer(write_queue_, wbs[i], &metas[i],

    int ret = api_.WriteBufferQueuePostBuffer(write_queue_, wbs[i], &metas[i],

                                              /*fence=*/-1);

    ASSERT_EQ(ret, 0);

  };



  std::function<void(size_t i)> Acquire = [&](size_t i) {

    int ret = dvrReadBufferQueueAcquireBuffer(read_queue, /*timeout=*/10,

    int ret = api_.ReadBufferQueueAcquireBuffer(read_queue, /*timeout=*/10,

                                                &rbs[i], &metas[i], &fence_fd);

    ASSERT_EQ(ret, 0);

    ASSERT_LT(fence_fd, 0);  // expect invalid fence.

    ASSERT_TRUE(dvrReadBufferIsValid(rbs[i]));

    ASSERT_TRUE(api_.ReadBufferIsValid(rbs[i]));



    int buffer_id = dvrReadBufferGetId(rbs[i]);

    int buffer_id = api_.ReadBufferGetId(rbs[i]);

    ASSERT_GT(buffer_id, 0);



    AHardwareBuffer* hb = nullptr;

    ASSERT_EQ(0, dvrReadBufferGetAHardwareBuffer(rbs[i], &hb));

    ASSERT_EQ(0, api_.ReadBufferGetAHardwareBuffer(rbs[i], &hb));



    auto rhb_it = rhbs.find(buffer_id);

    if (rhb_it == rhbs.end()) {
@@ -460,9 +480,9 @@ TEST_F(DvrBufferQueueTest, StableBufferIdAndHardwareBuffer) { 
  };



  std::function<void(size_t i)> Release = [&](size_t i) {

    ASSERT_TRUE(dvrReadBufferIsValid(rbs[i]));

    ASSERT_TRUE(api_.ReadBufferIsValid(rbs[i]));



    int ret = dvrReadBufferQueueReleaseBuffer(read_queue, rbs[i], &metas[i],

    int ret = api_.ReadBufferQueueReleaseBuffer(read_queue, rbs[i], &metas[i],

                                                /*release_fence_fd=*/-1);

    ASSERT_EQ(ret, 0);

  };

vulkan/libvulkan/driver.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1170,8 +1170,7 @@ void GetDeviceQueue2(VkDevice device, 
    const auto& data = GetData(device);



    data.driver.GetDeviceQueue2(device, pQueueInfo, pQueue);

    if (pQueue != VK_NULL_HANDLE)

        SetData(*pQueue, data);

    if (*pQueue != VK_NULL_HANDLE) SetData(*pQueue, data);

}



VKAPI_ATTR VkResult