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

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

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

parents 34a327b7 19ef01c8

libs/vr/libdvr/dvr_buffer_queue.cpp

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

  return write_queue->producer_queue_->capacity();

}

}





void* dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

jobject dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

                                              JNIEnv* env) {

                                              JNIEnv* env) {

  CHECK_PARAM(env);

  CHECK_PARAM(env);

  CHECK_PARAM(write_queue);

  CHECK_PARAM(write_queue);

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

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

typedef void (*DvrWriteBufferQueueDestroyPtr)(DvrWriteBufferQueue* write_queue);

typedef size_t (*DvrWriteBufferQueueGetCapacityPtr)(

typedef size_t (*DvrWriteBufferQueueGetCapacityPtr)(

    DvrWriteBufferQueue* write_queue);

    DvrWriteBufferQueue* write_queue);

typedef void* (*DvrWriteBufferQueueGetExternalSurfacePtr)(

typedef jobject (*DvrWriteBufferQueueGetExternalSurfacePtr)(

    DvrWriteBufferQueue* write_queue, JNIEnv* env);

    DvrWriteBufferQueue* write_queue, JNIEnv* env);

typedef int (*DvrWriteBufferQueueCreateReadQueuePtr)(

typedef int (*DvrWriteBufferQueueCreateReadQueuePtr)(

    DvrWriteBufferQueue* write_queue, DvrReadBufferQueue** out_read_queue);

    DvrWriteBufferQueue* write_queue, DvrReadBufferQueue** out_read_queue);

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

+2 −2
Original line number Original line 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

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

// using ANativeWindow_fromSurface NDK API.

// using ANativeWindow_fromSurface NDK API.

void* dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

jobject dvrWriteBufferQueueGetExternalSurface(DvrWriteBufferQueue* write_queue,

                                              JNIEnv* env);

                                              JNIEnv* env);





int dvrWriteBufferQueueCreateReadQueue(DvrWriteBufferQueue* write_queue,

int dvrWriteBufferQueueCreateReadQueue(DvrWriteBufferQueue* write_queue,