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

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

Merge "Allow the same producer to gain a buffer twice."

parents d653633b 60887c97

libs/vr/libbufferhub/buffer_hub-test.cpp

+12 −8
Original line number Diff line number Diff line
@@ -212,9 +212,8 @@ TEST_F(LibBufferHubTest, TestStateTransitions) { 
  LocalHandle fence;

  EXPECT_EQ(0, p->GainAsync());



  // Acquire and gain in gained state should fail.

  // Acquire in gained state should fail.

  EXPECT_EQ(-EBUSY, c->Acquire(&fence));

  EXPECT_EQ(-EALREADY, p->Gain(&fence));



  // Post in gained state should succeed.

  EXPECT_EQ(0, p->Post(LocalHandle()));
@@ -242,9 +241,8 @@ TEST_F(LibBufferHubTest, TestStateTransitions) { 
  // Gain in released state should succeed.

  EXPECT_EQ(0, p->Gain(&fence));



  // Acquire and gain in gained state should fail.

  // Acquire in gained state should fail.

  EXPECT_EQ(-EBUSY, c->Acquire(&fence));

  EXPECT_EQ(-EALREADY, p->Gain(&fence));

}



TEST_F(LibBufferHubTest, TestAsyncStateTransitions) {
@@ -259,10 +257,9 @@ TEST_F(LibBufferHubTest, TestAsyncStateTransitions) { 
  LocalHandle invalid_fence;

  EXPECT_EQ(0, p->GainAsync());



  // Acquire and gain in gained state should fail.

  // Acquire in gained state should fail.

  EXPECT_EQ(-EBUSY, c->AcquireAsync(&metadata, &invalid_fence));

  EXPECT_FALSE(invalid_fence.IsValid());

  EXPECT_EQ(-EALREADY, p->GainAsync(&metadata, &invalid_fence));

  EXPECT_FALSE(invalid_fence.IsValid());



  // Post in gained state should succeed.
@@ -309,8 +306,15 @@ TEST_F(LibBufferHubTest, TestAsyncStateTransitions) { 
  // Acquire and gain in gained state should fail.

  EXPECT_EQ(-EBUSY, c->AcquireAsync(&metadata, &invalid_fence));

  EXPECT_FALSE(invalid_fence.IsValid());

  EXPECT_EQ(-EALREADY, p->GainAsync(&metadata, &invalid_fence));

  EXPECT_FALSE(invalid_fence.IsValid());

}



TEST_F(LibBufferHubTest, TestGainTwiceByTheSameProducer) {

  std::unique_ptr<ProducerBuffer> p = ProducerBuffer::Create(

      kWidth, kHeight, kFormat, kUsage, sizeof(uint64_t));

  ASSERT_TRUE(p.get() != nullptr);



  ASSERT_EQ(0, p->GainAsync());

  ASSERT_EQ(0, p->GainAsync());

}



TEST_F(LibBufferHubTest, TestGainPostedBuffer) {

libs/vr/libbufferhub/producer_buffer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -172,9 +172,10 @@ int ProducerBuffer::LocalGain(DvrNativeBufferMetadata* out_meta, 
  if (BufferHubDefs::IsClientGained(current_buffer_state,

                                    client_state_mask())) {

    ALOGI("%s: already gained id=%d.", __FUNCTION__, id());

    return -EALREADY;

    return 0;

  }

  if (BufferHubDefs::AnyClientAcquired(current_buffer_state) ||

      BufferHubDefs::AnyClientGained(current_buffer_state) ||

      (BufferHubDefs::AnyClientPosted(current_buffer_state) &&

       !gain_posted_buffer)) {

    ALOGE("%s: not released id=%d state=%" PRIx64 ".", __FUNCTION__, id(),
@@ -196,6 +197,7 @@ int ProducerBuffer::LocalGain(DvrNativeBufferMetadata* out_meta, 
        __FUNCTION__, current_buffer_state, updated_buffer_state);



    if (BufferHubDefs::AnyClientAcquired(current_buffer_state) ||

        BufferHubDefs::AnyClientGained(current_buffer_state) ||

        (BufferHubDefs::AnyClientPosted(current_buffer_state) &&

         !gain_posted_buffer)) {

      ALOGE(