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

Commit c61477d9 authored by Jiwen Cai's avatar Jiwen Cai Committed by android-build-merger
Browse files

Merge "Return jobject when getting android Java Surface" into oc-dev 

am: 9d7bbd80

Change-Id: Ib499fa6ea6249a942ba29d982a0b3efa00ce7bec
parents e9121442 9d7bbd80

libs/vr/libdvr/dvr_buffer_queue.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ size_t dvrWriteBufferQueueGetCapacity(DvrWriteBufferQueue* write_queue) { 
  return write_queue->producer_queue_->capacity();

}



void* dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

jobject dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

                                              JNIEnv* env) {

  CHECK_PARAM(env);

  CHECK_PARAM(write_queue);

libs/vr/libdvr/include/dvr/dvr_api.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ typedef int (*DvrReadBufferReleaseAsyncPtr)(DvrReadBuffer* client); 
typedef void (*DvrWriteBufferQueueDestroyPtr)(DvrWriteBufferQueue* write_queue);

typedef size_t (*DvrWriteBufferQueueGetCapacityPtr)(

    DvrWriteBufferQueue* write_queue);

typedef void* (*DvrWriteBufferQueueGetExternalSurfacePtr)(

typedef jobject (*DvrWriteBufferQueueGetExternalSurfacePtr)(

    DvrWriteBufferQueue* write_queue, JNIEnv* env);

typedef int (*DvrWriteBufferQueueCreateReadQueuePtr)(

    DvrWriteBufferQueue* write_queue, DvrReadBufferQueue** out_read_queue);

libs/vr/libdvr/include/dvr/dvr_buffer_queue.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ size_t dvrWriteBufferQueueGetCapacity(DvrWriteBufferQueue* write_queue); 


// Returns ANativeWindow in the form of jobject. Can be casted to ANativeWindow

// using ANativeWindow_fromSurface NDK API.

void* dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

jobject dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

                                              JNIEnv* env);



int dvrWriteBufferQueueCreateReadQueue(DvrWriteBufferQueue* write_queue,