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

Commit 4b0fb292 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by android-build-merger
Browse files

Merge "Camera: Update for video buffer binder changes" into nyc-dev 

am: b99d272e

* commit 'b99d272e':
  Camera: Update for video buffer binder changes

Change-Id: I56154ef831d65eda27b164b1fa746ae91a256a91
parents 35bb1d75 b99d272e

core/jni/android_hardware_Camera.cpp

+6 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public: 
    virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr,

                          camera_frame_metadata_t *metadata);

    virtual void postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr);

    virtual void postRecordingFrameHandleTimestamp(nsecs_t timestamp, native_handle_t* handle);

    void postMetadata(JNIEnv *env, int32_t msgType, camera_frame_metadata_t *metadata);

    void addCallbackBuffer(JNIEnv *env, jbyteArray cbb, int msgType);

    void setCallbackMode(JNIEnv *env, bool installed, bool manualMode);
@@ -349,6 +350,11 @@ void JNICameraContext::postDataTimestamp(nsecs_t timestamp, int32_t msgType, con 
    postData(msgType, dataPtr, NULL);

}



void JNICameraContext::postRecordingFrameHandleTimestamp(nsecs_t, native_handle_t*) {

    // This is not needed at app layer. This should not be called because JNICameraContext cannot

    // start video recording.

}



void JNICameraContext::postMetadata(JNIEnv *env, int32_t msgType, camera_frame_metadata_t *metadata)

{

    jobjectArray obj = NULL;