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

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

Merge "Remove pending_consumers_ from producer channel"

parents 70f02792 0cdd2a0e

services/vr/bufferhubd/buffer_channel.cpp

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ BufferHubChannel::BufferInfo BufferChannel::GetBufferInfo() const { 
      buffer_id(), /*consumer_count=*/0, buffer_node_->buffer_desc().width,

      buffer_node_->buffer_desc().height, buffer_node_->buffer_desc().layers,

      buffer_node_->buffer_desc().format, buffer_node_->buffer_desc().usage,

      /*pending_count=*/0, /*state=*/0, /*signaled_mask=*/0,

      /*index=*/0);

      /*state=*/0, /*signaled_mask=*/0, /*index=*/0);

}



void BufferChannel::HandleImpulse(Message& /*message*/) {

services/vr/bufferhubd/buffer_hub.cpp

+0 −4
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ std::string BufferHubService::DumpState(size_t /*max_length*/) { 
  stream << " ";

  stream << std::setw(10) << "Usage";

  stream << " ";

  stream << std::setw(9) << "Pending";

  stream << " ";

  stream << std::setw(18) << "State";

  stream << " ";

  stream << std::setw(18) << "Signaled";
@@ -90,8 +88,6 @@ std::string BufferHubService::DumpState(size_t /*max_length*/) { 
      stream << std::setw(8) << info.usage;

      stream << std::dec << std::setfill(' ');

      stream << " ";

      stream << std::setw(9) << info.pending_count;

      stream << " ";

      stream << "0x" << std::hex << std::setfill('0');

      stream << std::setw(16) << info.state;

      stream << " ";

services/vr/bufferhubd/consumer_channel.cpp

+1 −2
Original line number Diff line number Diff line
@@ -153,11 +153,10 @@ Status<void> ConsumerChannel::OnConsumerRelease(Message& message, 
  }

}



bool ConsumerChannel::OnProducerPosted() {

void ConsumerChannel::OnProducerPosted() {

  acquired_ = false;

  released_ = false;

  SignalAvailable();

  return true;

}



void ConsumerChannel::OnProducerClosed() {

services/vr/bufferhubd/include/private/dvr/buffer_hub.h

+1 −4
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ class BufferHubChannel : public pdx::Channel { 
    uint32_t layer_count = 0;

    uint32_t format = 0;

    uint64_t usage = 0;

    size_t pending_count = 0;

    uint64_t state = 0;

    uint64_t signaled_mask = 0;

    uint64_t index = 0;
@@ -63,8 +62,7 @@ class BufferHubChannel : public pdx::Channel { 


    BufferInfo(int id, size_t consumer_count, uint32_t width, uint32_t height,

               uint32_t layer_count, uint32_t format, uint64_t usage,

               size_t pending_count, uint64_t state, uint64_t signaled_mask,

               uint64_t index)

               uint64_t state, uint64_t signaled_mask, uint64_t index)

        : id(id),

          type(kProducerType),

          consumer_count(consumer_count),
@@ -73,7 +71,6 @@ class BufferHubChannel : public pdx::Channel { 
          layer_count(layer_count),

          format(format),

          usage(usage),

          pending_count(pending_count),

          state(state),

          signaled_mask(signaled_mask),

          index(index) {}

services/vr/bufferhubd/include/private/dvr/consumer_channel.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class ConsumerChannel : public BufferHubChannel { 
  uint64_t client_state_mask() const { return client_state_mask_; }

  BufferInfo GetBufferInfo() const override;



  bool OnProducerPosted();

  void OnProducerPosted();

  void OnProducerClosed();



 private: