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

Commit 81ed94e4 authored by chenhg's avatar chenhg Committed by android-build-merger
Browse files

Merge "Avoid segfaults if disconnect USB camera while preview." am: 4dce57e4 am: 86ec58ff 

am: a1690236

Change-Id: I6f1b820f87297564c54b3ee656e201ec79838d78
parents 0836578d a1690236

camera/device/3.4/default/ExternalCameraDeviceSession.cpp

+5 −1
Original line number Diff line number Diff line
@@ -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(