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

Commit 023162b7 authored by Tianyu Jiang's avatar Tianyu Jiang Committed by Android (Google) Code Review
Browse files

Merge "Change the definition of buffer state and client state bits."

parents 8f91005f f669f6a2

libs/ui/tests/BufferHubBuffer_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ const int kFormat = HAL_PIXEL_FORMAT_RGBA_8888; 
const int kUsage = 0;

const size_t kUserMetadataSize = 0;



using dvr::BufferHubDefs::IsBufferGained;

using dvr::BufferHubDefs::IsBufferReleased;

using dvr::BufferHubDefs::kFirstClientBitMask;

using dvr::BufferHubDefs::kMetadataHeaderSize;

using frameworks::bufferhub::V1_0::BufferHubStatus;
@@ -119,9 +119,9 @@ TEST_F(BufferHubBufferTest, DuplicateBufferHubBuffer) { 
    // We use client_state_mask() to tell those two instances apart.

    EXPECT_NE(bufferStateMask1, bufferStateMask2);



    // Both buffer instances should be in gained state.

    EXPECT_TRUE(IsBufferGained(b1->buffer_state()));

    EXPECT_TRUE(IsBufferGained(b2->buffer_state()));

    // Both buffer instances should be in released state currently.

    EXPECT_TRUE(IsBufferReleased(b1->buffer_state()));

    EXPECT_TRUE(IsBufferReleased(b2->buffer_state()));



    // TODO(b/112338294): rewrite test after migration

    return;

libs/ui/tests/BufferHubMetadata_test.cpp

+3 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <gtest/gtest.h>

#include <ui/BufferHubMetadata.h>



using android::dvr::BufferHubDefs::IsBufferGained;

using android::dvr::BufferHubDefs::IsBufferReleased;



namespace android {

namespace dvr {
@@ -52,19 +52,13 @@ TEST_F(BufferHubMetadataTest, Import_Success) { 
  BufferHubDefs::MetadataHeader* mh1 = m1.metadata_header();

  EXPECT_NE(mh1, nullptr);



  // TODO(b/111976433): Update this test once BufferHub state machine gets

  // updated. In the old model, buffer starts in the gained state (i.e.

  // valued 0). In the new model, buffer states in the released state.

  EXPECT_TRUE(IsBufferGained(mh1->fence_state.load()));

  EXPECT_TRUE(IsBufferReleased(mh1->buffer_state.load()));



  EXPECT_TRUE(m2.IsValid());

  BufferHubDefs::MetadataHeader* mh2 = m2.metadata_header();

  EXPECT_NE(mh2, nullptr);



  // TODO(b/111976433): Update this test once BufferHub state machine gets

  // updated. In the old model, buffer starts in the gained state (i.e.

  // valued 0). In the new model, buffer states in the released state.

  EXPECT_TRUE(IsBufferGained(mh2->fence_state.load()));

  EXPECT_TRUE(IsBufferReleased(mh2->buffer_state.load()));

}



TEST_F(BufferHubMetadataTest, MoveMetadataInvalidatesOldOne) {