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

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

Merge "BufferHub: Clean up unnecessary DVR dependency"

parents f80d2686 36b5a0f5

libs/vr/libbufferhub/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ localIncludeFiles = [ 
]



staticLibraries = [

    "libdvrcommon",

    "libpdx_default_transport",

]

libs/vr/libbufferhubqueue/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ includeFiles = [ 


staticLibraries = [

    "libbufferhub",

    "libdvrcommon",

    "libpdx_default_transport",

]

libs/vr/libbufferhubqueue/include/private/dvr/buffer_hub_queue_client.h

+1 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <private/dvr/buffer_hub_queue_parcelable.h>

#include <private/dvr/bufferhub_rpc.h>

#include <private/dvr/epoll_file_descriptor.h>

#include <private/dvr/ring_buffer.h>



#include <memory>

#include <queue>
@@ -157,7 +156,7 @@ class BufferHubQueue : public pdx::Client { 
                                      int poll_events);

  pdx::Status<void> HandleQueueEvent(int poll_events);



  // Entry in the ring buffer of available buffers that stores related

  // Entry in the priority queue of available buffers that stores related

  // per-buffer data.

  struct Entry {

    Entry() : slot(0) {}
@@ -242,7 +241,6 @@ class BufferHubQueue : public pdx::Client { 
  std::array<std::shared_ptr<BufferHubBuffer>, kMaxQueueCapacity> buffers_;



  // Buffers and related data that are available for dequeue.

  // RingBuffer<Entry> available_buffers_{kMaxQueueCapacity};

  std::priority_queue<Entry, std::vector<Entry>, EntryComparator>

      available_buffers_;

libs/vr/libdvrcommon/include/private/dvr/epoll_file_descriptor.h→libs/vr/libbufferhubqueue/include/private/dvr/epoll_file_descriptor.h

+3 −3
Original line number Diff line number Diff line 
#ifndef LIBS_VR_LIBDVRCOMMON_INCLUDE_PRIVATE_DVR_EPOLL_FILE_DESCRIPTOR_H_

#define LIBS_VR_LIBDVRCOMMON_INCLUDE_PRIVATE_DVR_EPOLL_FILE_DESCRIPTOR_H_

#ifndef ANDROID_DVR_EPOLL_FILE_DESCRIPTOR_H_

#define ANDROID_DVR_EPOLL_FILE_DESCRIPTOR_H_



#include <android-base/unique_fd.h>

#include <log/log.h>
@@ -61,4 +61,4 @@ class EpollFileDescriptor { 
}  // namespace dvr

}  // namespace android



#endif  // LIBS_VR_LIBDVRCOMMON_INCLUDE_PRIVATE_DVR_EPOLL_FILE_DESCRIPTOR_H_
 
#endif  // ANDROID_DVR_EPOLL_FILE_DESCRIPTOR_H_