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

Merge "Camera: add batching support to HAL1 recording path" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-03 07:34:01 +00:00
committed by Android (Google) Code Review
parent cb9ceb3fd4 19ddea90c1
commit e1df48d3a0
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/jni/android_hardware_Camera.cpp
View File

@@ -78,6 +78,9 @@ public:
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);
virtual void postRecordingFrameHandleTimestampBatch(
const std::vector<nsecs_t>& timestamps,
const std::vector<native_handle_t*>& handles);
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);
@@ -362,6 +365,22 @@ void JNICameraContext::postRecordingFrameHandleTimestamp(nsecs_t, native_handle_
}
}
void JNICameraContext::postRecordingFrameHandleTimestampBatch(
const std::vector<nsecs_t>&,
const std::vector<native_handle_t*>& handles) {
// Video buffers are not needed at app layer so just return the video buffers here.
// This may be called when stagefright just releases camera but there are still outstanding
// video buffers.
if (mCamera != nullptr) {
mCamera->releaseRecordingFrameHandleBatch(handles);
} else {
for (auto& handle : handles) {
native_handle_close(handle);
native_handle_delete(handle);
}
}
}
void JNICameraContext::postMetadata(JNIEnv *env, int32_t msgType, camera_frame_metadata_t *metadata)
{
jobjectArray obj = NULL;