Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b99d272e43

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

Change-Id: I56154ef831d65eda27b164b1fa746ae91a256a91
This commit is contained in:
Chien-Yu Chen
2016-05-02 18:36:48 +00:00
committed by android-build-merger
parent 35bb1d75ad b99d272e43
commit 4b0fb29261
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_hardware_Camera.cpp
View File

@@ -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;