Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Avoid segfaults if disconnect USB camera while preview." am: 4dce57e459 am: 86ec58ff52

Browse Source 
am: a169023679

Change-Id: I6f1b820f87297564c54b3ee656e201ec79838d78
This commit is contained in:
chenhg
2018-10-16 11:30:03 -07:00
committed by android-build-merger
parent 0836578d61 a169023679
commit 81ed94e40e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camera/device/3.4/default/ExternalCameraDeviceSession.cpp
View File

@@ -1752,7 +1752,11 @@ bool ExternalCameraDeviceSession::OutputThread::threadLoop() {
// TODO: see if we can save some computation by converting to YV12 here
uint8_t* inData;
size_t inDataSize;
req->frameIn->map(&inData, &inDataSize);
if (req->frameIn->map(&inData, &inDataSize) != 0) {
lk.unlock();
return onDeviceError("%s: V4L2 buffer map failed", __FUNCTION__);
}
// TODO: in some special case maybe we can decode jpg directly to gralloc output?
ATRACE_BEGIN("MJPGtoI420");
int res = libyuv::MJPGToI420(