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

Commit 4dce57e4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Avoid segfaults if disconnect USB camera while preview."

parents bcb0c1b4 06ced051

camera/device/3.4/default/ExternalCameraDeviceSession.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -1737,7 +1737,11 @@ bool ExternalCameraDeviceSession::OutputThread::threadLoop() { 
    // TODO: see if we can save some computation by converting to YV12 here

    // TODO: see if we can save some computation by converting to YV12 here

    uint8_t* inData;

    uint8_t* inData;

    size_t inDataSize;

    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?

    // TODO: in some special case maybe we can decode jpg directly to gralloc output?

    ATRACE_BEGIN("MJPGtoI420");

    ATRACE_BEGIN("MJPGtoI420");

    int res = libyuv::MJPGToI420(

    int res = libyuv::MJPGToI420(