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

Commit d3391322 authored by Jiwen Cai's avatar Jiwen Cai Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'libdvr' 

* changes:
  Add dvr_buffer_queue C API
  Move DVR platform C API into libdvr
parents fe4dfb4f 2d82ceb8

libs/vr/libbufferhub/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
sourceFiles = [

    "buffer_hub_client.cpp",

    "buffer_hub_rpc.cpp",

    "dvr_buffer.cpp",

    "ion_buffer.cpp",

]

libs/vr/libbufferhubqueue/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ sharedLibraries = [ 
cc_library {

    name: "libbufferhubqueue",

    cflags = [

        "-DLOGTAG=\"libbufferhubqueue\"",

        "-DLOG_TAG=\"libbufferhubqueue\"",

        "-DTRACE=0",

    ],

    srcs: sourceFiles,

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

+21 −4
Original line number Diff line number Diff line
@@ -329,6 +329,9 @@ class ConsumerQueue : public pdx::ClientBase<ConsumerQueue, BufferHubQueue> { 
    return Dequeue(timeout, slot, meta, sizeof(*meta), acquire_fence);

  }



  std::shared_ptr<BufferConsumer> Dequeue(int timeout, size_t* slot, void* meta,

                                          size_t meta_size,

                                          LocalHandle* acquire_fence);

 private:

  friend BASE;
@@ -344,13 +347,27 @@ class ConsumerQueue : public pdx::ClientBase<ConsumerQueue, BufferHubQueue> { 
                    LocalHandle* acquire_fence) override;



  int OnBufferAllocated() override;



  std::shared_ptr<BufferConsumer> Dequeue(int timeout, size_t* slot, void* meta,

                                          size_t meta_size,

                                          LocalHandle* acquire_fence);

};



}  // namespace dvr

}  // namespace android



// Concrete C type definition for DVR API.



#ifdef __cplusplus

extern "C" {

#endif



struct DvrWriteBufferQueue {

  std::shared_ptr<android::dvr::ProducerQueue> producer_queue_;

};



struct DvrReadBufferQueue {

  std::shared_ptr<android::dvr::ConsumerQueue> consumer_queue_;

};



#ifdef __cplusplus

}  // extern "C"

#endif



#endif  // ANDROID_DVR_BUFFER_HUB_QUEUE_CLIENT_H_

libs/vr/libbufferhubqueue/tests/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ cc_test { 
    static_libs: static_libraries,

    shared_libs: shared_libraries,

    cflags: [

        "-DLOG_TAG=\"buffer_hub_queue-test\"",

        "-DTRACE=0",

        "-O0",

        "-g",
@@ -37,6 +38,7 @@ cc_test { 
    static_libs: static_libraries,

    shared_libs: shared_libraries,

    cflags: [

        "-DLOG_TAG=\"buffer_hub_queue_producer-test\"",

        "-DTRACE=0",

        "-O0",

        "-g",

libs/vr/libdisplay/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
sourceFiles = [

    "native_buffer_queue.cpp",

    "display_client.cpp",

    "display_manager_client.cpp",

    "display_manager_client_impl.cpp",

    "display_rpc.cpp",

    "dummy_native_window.cpp",
@@ -24,7 +23,6 @@ sourceFiles = [ 
    "late_latch.cpp",

    "video_mesh_surface_client.cpp",

    "vsync_client.cpp",

    "vsync_client_api.cpp",

    "screenshot_client.cpp",

    "frame_history.cpp",

]